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/mace.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/mace.c')
-rw-r--r-- | drivers/net/mace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/mace.c b/drivers/net/mace.c index ab5f0bf6d1ae..2328a7399dcb 100644 --- a/drivers/net/mace.c +++ b/drivers/net/mace.c | |||
@@ -598,7 +598,7 @@ static void mace_set_multicast(struct net_device *dev) | |||
598 | mp->maccc |= PROM; | 598 | mp->maccc |= PROM; |
599 | } else { | 599 | } else { |
600 | unsigned char multicast_filter[8]; | 600 | unsigned char multicast_filter[8]; |
601 | struct dev_mc_list *dmi; | 601 | struct netdev_hw_addr *ha; |
602 | 602 | ||
603 | if (dev->flags & IFF_ALLMULTI) { | 603 | if (dev->flags & IFF_ALLMULTI) { |
604 | for (i = 0; i < 8; i++) | 604 | for (i = 0; i < 8; i++) |
@@ -606,8 +606,8 @@ static void mace_set_multicast(struct net_device *dev) | |||
606 | } else { | 606 | } else { |
607 | for (i = 0; i < 8; i++) | 607 | for (i = 0; i < 8; i++) |
608 | multicast_filter[i] = 0; | 608 | multicast_filter[i] = 0; |
609 | netdev_for_each_mc_addr(dmi, dev) { | 609 | netdev_for_each_mc_addr(ha, dev) { |
610 | crc = ether_crc_le(6, dmi->dmi_addr); | 610 | crc = ether_crc_le(6, ha->addr); |
611 | i = crc >> 26; /* bit number in multicast_filter */ | 611 | i = crc >> 26; /* bit number in multicast_filter */ |
612 | multicast_filter[i >> 3] |= 1 << (i & 7); | 612 | multicast_filter[i >> 3] |= 1 << (i & 7); |
613 | } | 613 | } |