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/yellowfin.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/yellowfin.c')
-rw-r--r-- | drivers/net/yellowfin.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c index 7d4107f5eeb0..34c91cf5d839 100644 --- a/drivers/net/yellowfin.c +++ b/drivers/net/yellowfin.c | |||
@@ -1300,25 +1300,25 @@ static void set_rx_mode(struct net_device *dev) | |||
1300 | /* Too many to filter well, or accept all multicasts. */ | 1300 | /* Too many to filter well, or accept all multicasts. */ |
1301 | iowrite16(0x000B, ioaddr + AddrMode); | 1301 | iowrite16(0x000B, ioaddr + AddrMode); |
1302 | } else if (!netdev_mc_empty(dev)) { /* Must use the multicast hash table. */ | 1302 | } else if (!netdev_mc_empty(dev)) { /* Must use the multicast hash table. */ |
1303 | struct dev_mc_list *mclist; | 1303 | struct netdev_hw_addr *ha; |
1304 | u16 hash_table[4]; | 1304 | u16 hash_table[4]; |
1305 | int i; | 1305 | int i; |
1306 | 1306 | ||
1307 | memset(hash_table, 0, sizeof(hash_table)); | 1307 | memset(hash_table, 0, sizeof(hash_table)); |
1308 | netdev_for_each_mc_addr(mclist, dev) { | 1308 | netdev_for_each_mc_addr(ha, dev) { |
1309 | unsigned int bit; | 1309 | unsigned int bit; |
1310 | 1310 | ||
1311 | /* Due to a bug in the early chip versions, multiple filter | 1311 | /* Due to a bug in the early chip versions, multiple filter |
1312 | slots must be set for each address. */ | 1312 | slots must be set for each address. */ |
1313 | if (yp->drv_flags & HasMulticastBug) { | 1313 | if (yp->drv_flags & HasMulticastBug) { |
1314 | bit = (ether_crc_le(3, mclist->dmi_addr) >> 3) & 0x3f; | 1314 | bit = (ether_crc_le(3, ha->addr) >> 3) & 0x3f; |
1315 | hash_table[bit >> 4] |= (1 << bit); | 1315 | hash_table[bit >> 4] |= (1 << bit); |
1316 | bit = (ether_crc_le(4, mclist->dmi_addr) >> 3) & 0x3f; | 1316 | bit = (ether_crc_le(4, ha->addr) >> 3) & 0x3f; |
1317 | hash_table[bit >> 4] |= (1 << bit); | 1317 | hash_table[bit >> 4] |= (1 << bit); |
1318 | bit = (ether_crc_le(5, mclist->dmi_addr) >> 3) & 0x3f; | 1318 | bit = (ether_crc_le(5, ha->addr) >> 3) & 0x3f; |
1319 | hash_table[bit >> 4] |= (1 << bit); | 1319 | hash_table[bit >> 4] |= (1 << bit); |
1320 | } | 1320 | } |
1321 | bit = (ether_crc_le(6, mclist->dmi_addr) >> 3) & 0x3f; | 1321 | bit = (ether_crc_le(6, ha->addr) >> 3) & 0x3f; |
1322 | hash_table[bit >> 4] |= (1 << bit); | 1322 | hash_table[bit >> 4] |= (1 << bit); |
1323 | } | 1323 | } |
1324 | /* Copy the hash table to the chip. */ | 1324 | /* Copy the hash table to the chip. */ |