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/lp486e.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/lp486e.c')
-rw-r--r-- | drivers/net/lp486e.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c index 3e3cc04defd0..72379c5439dc 100644 --- a/drivers/net/lp486e.c +++ b/drivers/net/lp486e.c | |||
@@ -1256,7 +1256,7 @@ static void set_multicast_list(struct net_device *dev) { | |||
1256 | dev->name, netdev_mc_count(dev)); | 1256 | dev->name, netdev_mc_count(dev)); |
1257 | 1257 | ||
1258 | if (!netdev_mc_empty(dev)) { | 1258 | if (!netdev_mc_empty(dev)) { |
1259 | struct dev_mc_list *dmi; | 1259 | struct netdev_hw_addr *ha; |
1260 | char *cp; | 1260 | char *cp; |
1261 | cmd = kmalloc(sizeof(struct i596_cmd) + 2 + | 1261 | cmd = kmalloc(sizeof(struct i596_cmd) + 2 + |
1262 | netdev_mc_count(dev) * 6, GFP_ATOMIC); | 1262 | netdev_mc_count(dev) * 6, GFP_ATOMIC); |
@@ -1267,8 +1267,8 @@ static void set_multicast_list(struct net_device *dev) { | |||
1267 | cmd->command = CmdMulticastList; | 1267 | cmd->command = CmdMulticastList; |
1268 | *((unsigned short *) (cmd + 1)) = netdev_mc_count(dev) * 6; | 1268 | *((unsigned short *) (cmd + 1)) = netdev_mc_count(dev) * 6; |
1269 | cp = ((char *)(cmd + 1))+2; | 1269 | cp = ((char *)(cmd + 1))+2; |
1270 | netdev_for_each_mc_addr(dmi, dev) { | 1270 | netdev_for_each_mc_addr(ha, dev) { |
1271 | memcpy(cp, dmi->dmi_addr, 6); | 1271 | memcpy(cp, ha->addr, 6); |
1272 | cp += 6; | 1272 | cp += 6; |
1273 | } | 1273 | } |
1274 | if (i596_debug & LOG_SRCDST) | 1274 | if (i596_debug & LOG_SRCDST) |