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/ps3_gelic_net.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/ps3_gelic_net.c')
-rw-r--r-- | drivers/net/ps3_gelic_net.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c index a602da6418c8..fed5df9c5ea1 100644 --- a/drivers/net/ps3_gelic_net.c +++ b/drivers/net/ps3_gelic_net.c | |||
@@ -546,7 +546,7 @@ out: | |||
546 | void gelic_net_set_multi(struct net_device *netdev) | 546 | void gelic_net_set_multi(struct net_device *netdev) |
547 | { | 547 | { |
548 | struct gelic_card *card = netdev_card(netdev); | 548 | struct gelic_card *card = netdev_card(netdev); |
549 | struct dev_mc_list *mc; | 549 | struct netdev_hw_addr *ha; |
550 | unsigned int i; | 550 | unsigned int i; |
551 | uint8_t *p; | 551 | uint8_t *p; |
552 | u64 addr; | 552 | u64 addr; |
@@ -580,9 +580,9 @@ void gelic_net_set_multi(struct net_device *netdev) | |||
580 | } | 580 | } |
581 | 581 | ||
582 | /* set multicast addresses */ | 582 | /* set multicast addresses */ |
583 | netdev_for_each_mc_addr(mc, netdev) { | 583 | netdev_for_each_mc_addr(ha, netdev) { |
584 | addr = 0; | 584 | addr = 0; |
585 | p = mc->dmi_addr; | 585 | p = ha->addr; |
586 | for (i = 0; i < ETH_ALEN; i++) { | 586 | for (i = 0; i < ETH_ALEN; i++) { |
587 | addr <<= 8; | 587 | addr <<= 8; |
588 | addr |= *p++; | 588 | addr |= *p++; |