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/82596.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/82596.c')
-rw-r--r-- | drivers/net/82596.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index f94d17d78bb0..3a28b1f451d9 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c | |||
@@ -1542,7 +1542,7 @@ static void set_multicast_list(struct net_device *dev) | |||
1542 | } | 1542 | } |
1543 | 1543 | ||
1544 | if (!netdev_mc_empty(dev)) { | 1544 | if (!netdev_mc_empty(dev)) { |
1545 | struct dev_mc_list *dmi; | 1545 | struct netdev_hw_addr *ha; |
1546 | unsigned char *cp; | 1546 | unsigned char *cp; |
1547 | struct mc_cmd *cmd; | 1547 | struct mc_cmd *cmd; |
1548 | 1548 | ||
@@ -1552,10 +1552,10 @@ static void set_multicast_list(struct net_device *dev) | |||
1552 | cmd->cmd.command = CmdMulticastList; | 1552 | cmd->cmd.command = CmdMulticastList; |
1553 | cmd->mc_cnt = cnt * ETH_ALEN; | 1553 | cmd->mc_cnt = cnt * ETH_ALEN; |
1554 | cp = cmd->mc_addrs; | 1554 | cp = cmd->mc_addrs; |
1555 | netdev_for_each_mc_addr(dmi, dev) { | 1555 | netdev_for_each_mc_addr(ha, dev) { |
1556 | if (!cnt--) | 1556 | if (!cnt--) |
1557 | break; | 1557 | break; |
1558 | memcpy(cp, dmi->dmi_addr, ETH_ALEN); | 1558 | memcpy(cp, ha->addr, ETH_ALEN); |
1559 | if (i596_debug > 1) | 1559 | if (i596_debug > 1) |
1560 | DEB(DEB_MULTI,printk(KERN_INFO "%s: Adding address %pM\n", | 1560 | DEB(DEB_MULTI,printk(KERN_INFO "%s: Adding address %pM\n", |
1561 | dev->name, cp)); | 1561 | dev->name, cp)); |