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/lib82596.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/lib82596.c')
-rw-r--r-- | drivers/net/lib82596.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c index 443c39a3732f..fddaf921885e 100644 --- a/drivers/net/lib82596.c +++ b/drivers/net/lib82596.c | |||
@@ -1388,7 +1388,7 @@ static void set_multicast_list(struct net_device *dev) | |||
1388 | } | 1388 | } |
1389 | 1389 | ||
1390 | if (!netdev_mc_empty(dev)) { | 1390 | if (!netdev_mc_empty(dev)) { |
1391 | struct dev_mc_list *dmi; | 1391 | struct netdev_hw_addr *ha; |
1392 | unsigned char *cp; | 1392 | unsigned char *cp; |
1393 | struct mc_cmd *cmd; | 1393 | struct mc_cmd *cmd; |
1394 | 1394 | ||
@@ -1396,10 +1396,10 @@ static void set_multicast_list(struct net_device *dev) | |||
1396 | cmd->cmd.command = SWAP16(CmdMulticastList); | 1396 | cmd->cmd.command = SWAP16(CmdMulticastList); |
1397 | cmd->mc_cnt = SWAP16(netdev_mc_count(dev) * 6); | 1397 | cmd->mc_cnt = SWAP16(netdev_mc_count(dev) * 6); |
1398 | cp = cmd->mc_addrs; | 1398 | cp = cmd->mc_addrs; |
1399 | netdev_for_each_mc_addr(dmi, dev) { | 1399 | netdev_for_each_mc_addr(ha, dev) { |
1400 | if (!cnt--) | 1400 | if (!cnt--) |
1401 | break; | 1401 | break; |
1402 | memcpy(cp, dmi->dmi_addr, 6); | 1402 | memcpy(cp, ha->addr, 6); |
1403 | if (i596_debug > 1) | 1403 | if (i596_debug > 1) |
1404 | DEB(DEB_MULTI, | 1404 | DEB(DEB_MULTI, |
1405 | printk(KERN_DEBUG | 1405 | printk(KERN_DEBUG |