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/pcmcia/xirc2ps_cs.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/pcmcia/xirc2ps_cs.c')
-rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index 4d1802e457be..656be931207a 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
@@ -1398,7 +1398,7 @@ static void set_addresses(struct net_device *dev) | |||
1398 | { | 1398 | { |
1399 | unsigned int ioaddr = dev->base_addr; | 1399 | unsigned int ioaddr = dev->base_addr; |
1400 | local_info_t *lp = netdev_priv(dev); | 1400 | local_info_t *lp = netdev_priv(dev); |
1401 | struct dev_mc_list *dmi; | 1401 | struct netdev_hw_addr *ha; |
1402 | struct set_address_info sa_info; | 1402 | struct set_address_info sa_info; |
1403 | int i; | 1403 | int i; |
1404 | 1404 | ||
@@ -1413,10 +1413,10 @@ static void set_addresses(struct net_device *dev) | |||
1413 | 1413 | ||
1414 | set_address(&sa_info, dev->dev_addr); | 1414 | set_address(&sa_info, dev->dev_addr); |
1415 | i = 0; | 1415 | i = 0; |
1416 | netdev_for_each_mc_addr(dmi, dev) { | 1416 | netdev_for_each_mc_addr(ha, dev) { |
1417 | if (i++ == 9) | 1417 | if (i++ == 9) |
1418 | break; | 1418 | break; |
1419 | set_address(&sa_info, dmi->dmi_addr); | 1419 | set_address(&sa_info, ha->addr); |
1420 | } | 1420 | } |
1421 | while (i++ < 9) | 1421 | while (i++ < 9) |
1422 | set_address(&sa_info, dev->dev_addr); | 1422 | set_address(&sa_info, dev->dev_addr); |