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/smsc911x.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/smsc911x.c')
-rw-r--r-- | drivers/net/smsc911x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index 4fd1d8b38788..d6e3a12d65d3 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c | |||
@@ -1383,13 +1383,13 @@ static void smsc911x_set_multicast_list(struct net_device *dev) | |||
1383 | /* Enabling specific multicast addresses */ | 1383 | /* Enabling specific multicast addresses */ |
1384 | unsigned int hash_high = 0; | 1384 | unsigned int hash_high = 0; |
1385 | unsigned int hash_low = 0; | 1385 | unsigned int hash_low = 0; |
1386 | struct dev_mc_list *mc_list; | 1386 | struct netdev_hw_addr *ha; |
1387 | 1387 | ||
1388 | pdata->set_bits_mask = MAC_CR_HPFILT_; | 1388 | pdata->set_bits_mask = MAC_CR_HPFILT_; |
1389 | pdata->clear_bits_mask = (MAC_CR_PRMS_ | MAC_CR_MCPAS_); | 1389 | pdata->clear_bits_mask = (MAC_CR_PRMS_ | MAC_CR_MCPAS_); |
1390 | 1390 | ||
1391 | netdev_for_each_mc_addr(mc_list, dev) { | 1391 | netdev_for_each_mc_addr(ha, dev) { |
1392 | unsigned int bitnum = smsc911x_hash(mc_list->dmi_addr); | 1392 | unsigned int bitnum = smsc911x_hash(ha->addr); |
1393 | unsigned int mask = 0x01 << (bitnum & 0x1F); | 1393 | unsigned int mask = 0x01 << (bitnum & 0x1F); |
1394 | 1394 | ||
1395 | if (bitnum & 0x20) | 1395 | if (bitnum & 0x20) |