diff options
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_common.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_common.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c index 276c2aaa800b..eb49020903c1 100644 --- a/drivers/net/ixgbe/ixgbe_common.c +++ b/drivers/net/ixgbe/ixgbe_common.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <linux/pci.h> | 28 | #include <linux/pci.h> |
29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
30 | #include <linux/sched.h> | 30 | #include <linux/sched.h> |
31 | #include <linux/list.h> | ||
32 | #include <linux/netdevice.h> | 31 | #include <linux/netdevice.h> |
33 | 32 | ||
34 | #include "ixgbe.h" | 33 | #include "ixgbe.h" |
@@ -1347,7 +1346,7 @@ static void ixgbe_add_uc_addr(struct ixgbe_hw *hw, u8 *addr, u32 vmdq) | |||
1347 | /** | 1346 | /** |
1348 | * ixgbe_update_uc_addr_list_generic - Updates MAC list of secondary addresses | 1347 | * ixgbe_update_uc_addr_list_generic - Updates MAC list of secondary addresses |
1349 | * @hw: pointer to hardware structure | 1348 | * @hw: pointer to hardware structure |
1350 | * @uc_list: the list of new addresses | 1349 | * @netdev: pointer to net device structure |
1351 | * | 1350 | * |
1352 | * The given list replaces any existing list. Clears the secondary addrs from | 1351 | * The given list replaces any existing list. Clears the secondary addrs from |
1353 | * receive address registers. Uses unused receive address registers for the | 1352 | * receive address registers. Uses unused receive address registers for the |
@@ -1357,7 +1356,7 @@ static void ixgbe_add_uc_addr(struct ixgbe_hw *hw, u8 *addr, u32 vmdq) | |||
1357 | * manually putting the device into promiscuous mode. | 1356 | * manually putting the device into promiscuous mode. |
1358 | **/ | 1357 | **/ |
1359 | s32 ixgbe_update_uc_addr_list_generic(struct ixgbe_hw *hw, | 1358 | s32 ixgbe_update_uc_addr_list_generic(struct ixgbe_hw *hw, |
1360 | struct list_head *uc_list) | 1359 | struct net_device *netdev) |
1361 | { | 1360 | { |
1362 | u32 i; | 1361 | u32 i; |
1363 | u32 old_promisc_setting = hw->addr_ctrl.overflow_promisc; | 1362 | u32 old_promisc_setting = hw->addr_ctrl.overflow_promisc; |
@@ -1381,7 +1380,7 @@ s32 ixgbe_update_uc_addr_list_generic(struct ixgbe_hw *hw, | |||
1381 | } | 1380 | } |
1382 | 1381 | ||
1383 | /* Add the new addresses */ | 1382 | /* Add the new addresses */ |
1384 | list_for_each_entry(ha, uc_list, list) { | 1383 | netdev_for_each_uc_addr(ha, netdev) { |
1385 | hw_dbg(hw, " Adding the secondary addresses:\n"); | 1384 | hw_dbg(hw, " Adding the secondary addresses:\n"); |
1386 | ixgbe_add_uc_addr(hw, ha->addr, 0); | 1385 | ixgbe_add_uc_addr(hw, ha->addr, 0); |
1387 | } | 1386 | } |