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/tulip/winbond-840.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/tulip/winbond-840.c')
-rw-r--r-- | drivers/net/tulip/winbond-840.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index 304f43866c44..3e3822c98a0d 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c | |||
@@ -1367,13 +1367,15 @@ static u32 __set_rx_mode(struct net_device *dev) | |||
1367 | memset(mc_filter, 0xff, sizeof(mc_filter)); | 1367 | memset(mc_filter, 0xff, sizeof(mc_filter)); |
1368 | rx_mode = RxAcceptBroadcast | AcceptMulticast | AcceptMyPhys; | 1368 | rx_mode = RxAcceptBroadcast | AcceptMulticast | AcceptMyPhys; |
1369 | } else { | 1369 | } else { |
1370 | struct dev_mc_list *mclist; | 1370 | struct netdev_hw_addr *ha; |
1371 | 1371 | ||
1372 | memset(mc_filter, 0, sizeof(mc_filter)); | 1372 | memset(mc_filter, 0, sizeof(mc_filter)); |
1373 | netdev_for_each_mc_addr(mclist, dev) { | 1373 | netdev_for_each_mc_addr(ha, dev) { |
1374 | int filterbit = (ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26) ^ 0x3F; | 1374 | int filbit; |
1375 | filterbit &= 0x3f; | 1375 | |
1376 | mc_filter[filterbit >> 5] |= 1 << (filterbit & 31); | 1376 | filbit = (ether_crc(ETH_ALEN, ha->addr) >> 26) ^ 0x3F; |
1377 | filbit &= 0x3f; | ||
1378 | mc_filter[filbit >> 5] |= 1 << (filbit & 31); | ||
1377 | } | 1379 | } |
1378 | rx_mode = RxAcceptBroadcast | AcceptMulticast | AcceptMyPhys; | 1380 | rx_mode = RxAcceptBroadcast | AcceptMulticast | AcceptMyPhys; |
1379 | } | 1381 | } |