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/sunhme.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/sunhme.c')
-rw-r--r-- | drivers/net/sunhme.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index b17dbb11bd67..20deb14e98ff 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c | |||
@@ -1523,13 +1523,13 @@ static int happy_meal_init(struct happy_meal *hp) | |||
1523 | hme_write32(hp, bregs + BMAC_HTABLE3, 0xffff); | 1523 | hme_write32(hp, bregs + BMAC_HTABLE3, 0xffff); |
1524 | } else if ((hp->dev->flags & IFF_PROMISC) == 0) { | 1524 | } else if ((hp->dev->flags & IFF_PROMISC) == 0) { |
1525 | u16 hash_table[4]; | 1525 | u16 hash_table[4]; |
1526 | struct dev_mc_list *dmi; | 1526 | struct netdev_hw_addr *ha; |
1527 | char *addrs; | 1527 | char *addrs; |
1528 | u32 crc; | 1528 | u32 crc; |
1529 | 1529 | ||
1530 | memset(hash_table, 0, sizeof(hash_table)); | 1530 | memset(hash_table, 0, sizeof(hash_table)); |
1531 | netdev_for_each_mc_addr(dmi, hp->dev) { | 1531 | netdev_for_each_mc_addr(ha, hp->dev) { |
1532 | addrs = dmi->dmi_addr; | 1532 | addrs = ha->addr; |
1533 | 1533 | ||
1534 | if (!(*addrs & 1)) | 1534 | if (!(*addrs & 1)) |
1535 | continue; | 1535 | continue; |
@@ -2362,7 +2362,7 @@ static void happy_meal_set_multicast(struct net_device *dev) | |||
2362 | { | 2362 | { |
2363 | struct happy_meal *hp = netdev_priv(dev); | 2363 | struct happy_meal *hp = netdev_priv(dev); |
2364 | void __iomem *bregs = hp->bigmacregs; | 2364 | void __iomem *bregs = hp->bigmacregs; |
2365 | struct dev_mc_list *dmi; | 2365 | struct netdev_hw_addr *ha; |
2366 | char *addrs; | 2366 | char *addrs; |
2367 | u32 crc; | 2367 | u32 crc; |
2368 | 2368 | ||
@@ -2380,8 +2380,8 @@ static void happy_meal_set_multicast(struct net_device *dev) | |||
2380 | u16 hash_table[4]; | 2380 | u16 hash_table[4]; |
2381 | 2381 | ||
2382 | memset(hash_table, 0, sizeof(hash_table)); | 2382 | memset(hash_table, 0, sizeof(hash_table)); |
2383 | netdev_for_each_mc_addr(dmi, dev) { | 2383 | netdev_for_each_mc_addr(ha, dev) { |
2384 | addrs = dmi->dmi_addr; | 2384 | addrs = ha->addr; |
2385 | 2385 | ||
2386 | if (!(*addrs & 1)) | 2386 | if (!(*addrs & 1)) |
2387 | continue; | 2387 | continue; |