diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-02-17 22:34:54 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-18 17:47:50 -0500 |
commit | 4302b67e041ea81c8fc233bee1296516e1294a27 (patch) | |
tree | c6160bcf70f321c7436f34033d39180c9043bfd9 /drivers/net/tulip/winbond-840.c | |
parent | 5508590c193661bc1484ad7b952af5fceacea40d (diff) |
tulip: convert to use netdev_for_each_mc_addr
also bug in de2104x.c was corrected:
for (i = 0; i < 32; i++) loop should be outside mc_list iteration.
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 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index 98711a9f35ac..304f43866c44 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c | |||
@@ -1368,11 +1368,9 @@ static u32 __set_rx_mode(struct net_device *dev) | |||
1368 | rx_mode = RxAcceptBroadcast | AcceptMulticast | AcceptMyPhys; | 1368 | rx_mode = RxAcceptBroadcast | AcceptMulticast | AcceptMyPhys; |
1369 | } else { | 1369 | } else { |
1370 | struct dev_mc_list *mclist; | 1370 | struct dev_mc_list *mclist; |
1371 | int i; | 1371 | |
1372 | memset(mc_filter, 0, sizeof(mc_filter)); | 1372 | memset(mc_filter, 0, sizeof(mc_filter)); |
1373 | for (i = 0, mclist = dev->mc_list; | 1373 | netdev_for_each_mc_addr(mclist, dev) { |
1374 | mclist && i < netdev_mc_count(dev); | ||
1375 | i++, mclist = mclist->next) { | ||
1376 | int filterbit = (ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26) ^ 0x3F; | 1374 | int filterbit = (ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26) ^ 0x3F; |
1377 | filterbit &= 0x3f; | 1375 | filterbit &= 0x3f; |
1378 | mc_filter[filterbit >> 5] |= 1 << (filterbit & 31); | 1376 | mc_filter[filterbit >> 5] |= 1 << (filterbit & 31); |