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/3c505.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/3c505.c')
-rw-r--r-- | drivers/net/3c505.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c index 04b5bba19021..81c8b31e629f 100644 --- a/drivers/net/3c505.c +++ b/drivers/net/3c505.c | |||
@@ -1216,7 +1216,7 @@ static int elp_close(struct net_device *dev) | |||
1216 | static void elp_set_mc_list(struct net_device *dev) | 1216 | static void elp_set_mc_list(struct net_device *dev) |
1217 | { | 1217 | { |
1218 | elp_device *adapter = netdev_priv(dev); | 1218 | elp_device *adapter = netdev_priv(dev); |
1219 | struct dev_mc_list *dmi; | 1219 | struct netdev_hw_addr *ha; |
1220 | int i; | 1220 | int i; |
1221 | unsigned long flags; | 1221 | unsigned long flags; |
1222 | 1222 | ||
@@ -1231,8 +1231,9 @@ static void elp_set_mc_list(struct net_device *dev) | |||
1231 | adapter->tx_pcb.command = CMD_LOAD_MULTICAST_LIST; | 1231 | adapter->tx_pcb.command = CMD_LOAD_MULTICAST_LIST; |
1232 | adapter->tx_pcb.length = 6 * netdev_mc_count(dev); | 1232 | adapter->tx_pcb.length = 6 * netdev_mc_count(dev); |
1233 | i = 0; | 1233 | i = 0; |
1234 | netdev_for_each_mc_addr(dmi, dev) | 1234 | netdev_for_each_mc_addr(ha, dev) |
1235 | memcpy(adapter->tx_pcb.data.multicast[i++], dmi->dmi_addr, 6); | 1235 | memcpy(adapter->tx_pcb.data.multicast[i++], |
1236 | ha->addr, 6); | ||
1236 | adapter->got[CMD_LOAD_MULTICAST_LIST] = 0; | 1237 | adapter->got[CMD_LOAD_MULTICAST_LIST] = 0; |
1237 | if (!send_pcb(dev, &adapter->tx_pcb)) | 1238 | if (!send_pcb(dev, &adapter->tx_pcb)) |
1238 | pr_err("%s: couldn't send set_multicast command\n", dev->name); | 1239 | pr_err("%s: couldn't send set_multicast command\n", dev->name); |