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/macmace.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/macmace.c')
-rw-r--r-- | drivers/net/macmace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c index 13ba8f4afb7e..8a50c67e5928 100644 --- a/drivers/net/macmace.c +++ b/drivers/net/macmace.c | |||
@@ -508,7 +508,7 @@ static void mace_set_multicast(struct net_device *dev) | |||
508 | mb->maccc |= PROM; | 508 | mb->maccc |= PROM; |
509 | } else { | 509 | } else { |
510 | unsigned char multicast_filter[8]; | 510 | unsigned char multicast_filter[8]; |
511 | struct dev_mc_list *dmi; | 511 | struct netdev_hw_addr *ha; |
512 | 512 | ||
513 | if (dev->flags & IFF_ALLMULTI) { | 513 | if (dev->flags & IFF_ALLMULTI) { |
514 | for (i = 0; i < 8; i++) { | 514 | for (i = 0; i < 8; i++) { |
@@ -517,8 +517,8 @@ static void mace_set_multicast(struct net_device *dev) | |||
517 | } else { | 517 | } else { |
518 | for (i = 0; i < 8; i++) | 518 | for (i = 0; i < 8; i++) |
519 | multicast_filter[i] = 0; | 519 | multicast_filter[i] = 0; |
520 | netdev_for_each_mc_addr(dmi, dev) { | 520 | netdev_for_each_mc_addr(ha, dev) { |
521 | crc = ether_crc_le(6, dmi->dmi_addr); | 521 | crc = ether_crc_le(6, ha->addr); |
522 | /* bit number in multicast_filter */ | 522 | /* bit number in multicast_filter */ |
523 | i = crc >> 26; | 523 | i = crc >> 26; |
524 | multicast_filter[i >> 3] |= 1 << (i & 7); | 524 | multicast_filter[i >> 3] |= 1 << (i & 7); |