diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-01-25 16:36:10 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-25 16:36:10 -0500 |
commit | 32e7bfc41110bc8f29ec0f293c3bcee6645fef34 (patch) | |
tree | b770a040aee7a6a196514cbf5328debb33321d4d /drivers/net/bnx2.c | |
parent | 9010bc3364db56dd88a1851e0797e597e322ce08 (diff) |
net: use helpers to access uc list V2
This patch introduces three macros to work with uc list from net drivers.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2.c')
-rw-r--r-- | drivers/net/bnx2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index d83512d3e02f..a7b6b12c1c05 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
@@ -48,7 +48,6 @@ | |||
48 | #include <linux/cache.h> | 48 | #include <linux/cache.h> |
49 | #include <linux/firmware.h> | 49 | #include <linux/firmware.h> |
50 | #include <linux/log2.h> | 50 | #include <linux/log2.h> |
51 | #include <linux/list.h> | ||
52 | 51 | ||
53 | #if defined(CONFIG_CNIC) || defined(CONFIG_CNIC_MODULE) | 52 | #if defined(CONFIG_CNIC) || defined(CONFIG_CNIC_MODULE) |
54 | #define BCM_CNIC 1 | 53 | #define BCM_CNIC 1 |
@@ -3579,14 +3578,14 @@ bnx2_set_rx_mode(struct net_device *dev) | |||
3579 | sort_mode |= BNX2_RPM_SORT_USER0_MC_HSH_EN; | 3578 | sort_mode |= BNX2_RPM_SORT_USER0_MC_HSH_EN; |
3580 | } | 3579 | } |
3581 | 3580 | ||
3582 | if (dev->uc.count > BNX2_MAX_UNICAST_ADDRESSES) { | 3581 | if (netdev_uc_count(dev) > BNX2_MAX_UNICAST_ADDRESSES) { |
3583 | rx_mode |= BNX2_EMAC_RX_MODE_PROMISCUOUS; | 3582 | rx_mode |= BNX2_EMAC_RX_MODE_PROMISCUOUS; |
3584 | sort_mode |= BNX2_RPM_SORT_USER0_PROM_EN | | 3583 | sort_mode |= BNX2_RPM_SORT_USER0_PROM_EN | |
3585 | BNX2_RPM_SORT_USER0_PROM_VLAN; | 3584 | BNX2_RPM_SORT_USER0_PROM_VLAN; |
3586 | } else if (!(dev->flags & IFF_PROMISC)) { | 3585 | } else if (!(dev->flags & IFF_PROMISC)) { |
3587 | /* Add all entries into to the match filter list */ | 3586 | /* Add all entries into to the match filter list */ |
3588 | i = 0; | 3587 | i = 0; |
3589 | list_for_each_entry(ha, &dev->uc.list, list) { | 3588 | netdev_for_each_uc_addr(ha, dev) { |
3590 | bnx2_set_mac_addr(bp, ha->addr, | 3589 | bnx2_set_mac_addr(bp, ha->addr, |
3591 | i + BNX2_START_UNICAST_ADDRESS_INDEX); | 3590 | i + BNX2_START_UNICAST_ADDRESS_INDEX); |
3592 | sort_mode |= (1 << | 3591 | sort_mode |= (1 << |