diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-04-01 17:22:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-03 17:22:15 -0400 |
commit | 22bedad3ce112d5ca1eaf043d4990fa2ed698c87 (patch) | |
tree | b6fba5688d48b1396f01d13ee53610dea7749c15 /drivers/net/bnx2.c | |
parent | a748ee2426817a95b1f03012d8f339c45c722ae1 (diff) |
net: convert multicast list to list_head
Converts the list and the core manipulating with it to be the same as uc_list.
+uses two functions for adding/removing mc address (normal and "global"
variant) instead of a function parameter.
+removes dev_mcast.c completely.
+exposes netdev_hw_addr_list_* macros along with __hw_addr_* functions for
manipulation with lists on a sandbox (used in bonding and 80211 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 381887ba677c..0b69ffb7951d 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
@@ -3544,7 +3544,6 @@ bnx2_set_rx_mode(struct net_device *dev) | |||
3544 | } | 3544 | } |
3545 | else { | 3545 | else { |
3546 | /* Accept one or more multicast(s). */ | 3546 | /* Accept one or more multicast(s). */ |
3547 | struct dev_mc_list *mclist; | ||
3548 | u32 mc_filter[NUM_MC_HASH_REGISTERS]; | 3547 | u32 mc_filter[NUM_MC_HASH_REGISTERS]; |
3549 | u32 regidx; | 3548 | u32 regidx; |
3550 | u32 bit; | 3549 | u32 bit; |
@@ -3552,8 +3551,8 @@ bnx2_set_rx_mode(struct net_device *dev) | |||
3552 | 3551 | ||
3553 | memset(mc_filter, 0, 4 * NUM_MC_HASH_REGISTERS); | 3552 | memset(mc_filter, 0, 4 * NUM_MC_HASH_REGISTERS); |
3554 | 3553 | ||
3555 | netdev_for_each_mc_addr(mclist, dev) { | 3554 | netdev_for_each_mc_addr(ha, dev) { |
3556 | crc = ether_crc_le(ETH_ALEN, mclist->dmi_addr); | 3555 | crc = ether_crc_le(ETH_ALEN, ha->addr); |
3557 | bit = crc & 0xff; | 3556 | bit = crc & 0xff; |
3558 | regidx = (bit & 0xe0) >> 5; | 3557 | regidx = (bit & 0xe0) >> 5; |
3559 | bit &= 0x1f; | 3558 | bit &= 0x1f; |