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/sonic.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/sonic.c')
-rw-r--r-- | drivers/net/sonic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sonic.c b/drivers/net/sonic.c index 287c251075e5..e5d67327d707 100644 --- a/drivers/net/sonic.c +++ b/drivers/net/sonic.c | |||
@@ -531,7 +531,7 @@ static void sonic_multicast_list(struct net_device *dev) | |||
531 | { | 531 | { |
532 | struct sonic_local *lp = netdev_priv(dev); | 532 | struct sonic_local *lp = netdev_priv(dev); |
533 | unsigned int rcr; | 533 | unsigned int rcr; |
534 | struct dev_mc_list *dmi; | 534 | struct netdev_hw_addr *ha; |
535 | unsigned char *addr; | 535 | unsigned char *addr; |
536 | int i; | 536 | int i; |
537 | 537 | ||
@@ -550,8 +550,8 @@ static void sonic_multicast_list(struct net_device *dev) | |||
550 | netdev_mc_count(dev)); | 550 | netdev_mc_count(dev)); |
551 | sonic_set_cam_enable(dev, 1); /* always enable our own address */ | 551 | sonic_set_cam_enable(dev, 1); /* always enable our own address */ |
552 | i = 1; | 552 | i = 1; |
553 | netdev_for_each_mc_addr(dmi, dev) { | 553 | netdev_for_each_mc_addr(ha, dev) { |
554 | addr = dmi->dmi_addr; | 554 | addr = ha->addr; |
555 | sonic_cda_put(dev, i, SONIC_CD_CAP0, addr[1] << 8 | addr[0]); | 555 | sonic_cda_put(dev, i, SONIC_CD_CAP0, addr[1] << 8 | addr[0]); |
556 | sonic_cda_put(dev, i, SONIC_CD_CAP1, addr[3] << 8 | addr[2]); | 556 | sonic_cda_put(dev, i, SONIC_CD_CAP1, addr[3] << 8 | addr[2]); |
557 | sonic_cda_put(dev, i, SONIC_CD_CAP2, addr[5] << 8 | addr[4]); | 557 | sonic_cda_put(dev, i, SONIC_CD_CAP2, addr[5] << 8 | addr[4]); |