diff options
Diffstat (limited to 'drivers/net/igb/e1000_api.c')
-rw-r--r-- | drivers/net/igb/e1000_api.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/net/igb/e1000_api.c b/drivers/net/igb/e1000_api.c index 12e66a7e3817..984a36b61a1a 100644 --- a/drivers/net/igb/e1000_api.c +++ b/drivers/net/igb/e1000_api.c @@ -1,7 +1,7 @@ /******************************************************************************* Intel(R) Gigabit Ethernet Linux driver - Copyright(c) 2007-2013 Intel Corporation. + Copyright(c) 2007-2014 Intel Corporation. This program is free software; you can redistribute it and/or modify it under the terms and conditions of the GNU General Public License, @@ -12,14 +12,11 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License along with - this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. - The full GNU General Public License is included in this distribution in the file called "COPYING". Contact Information: + Linux NICS <linux.nics@intel.com> e1000-devel Mailing List <e1000-devel@lists.sourceforge.net> Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 @@ -184,7 +181,6 @@ s32 e1000_set_mac_type(struct e1000_hw *hw) break; case E1000_DEV_ID_I210_COPPER_FLASHLESS: case E1000_DEV_ID_I210_SERDES_FLASHLESS: - case E1000_DEV_ID_I210_TOOLS_ONLY: case E1000_DEV_ID_I210_COPPER: case E1000_DEV_ID_I210_COPPER_OEM1: case E1000_DEV_ID_I210_COPPER_IT: @@ -193,7 +189,6 @@ s32 e1000_set_mac_type(struct e1000_hw *hw) case E1000_DEV_ID_I210_SGMII: mac->type = e1000_i210; break; - case E1000_DEV_ID_I211_TOOLS_ONLY: case E1000_DEV_ID_I211_COPPER: mac->type = e1000_i211; break; @@ -631,10 +626,12 @@ void e1000_config_collision_dist(struct e1000_hw *hw) * * Sets a Receive Address Register (RAR) to the specified address. **/ -void e1000_rar_set(struct e1000_hw *hw, u8 *addr, u32 index) +int e1000_rar_set(struct e1000_hw *hw, u8 *addr, u32 index) { if (hw->mac.ops.rar_set) - hw->mac.ops.rar_set(hw, addr, index); + return hw->mac.ops.rar_set(hw, addr, index); + + return E1000_SUCCESS; } /** |