diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-02-23 04:19:49 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-26 05:07:30 -0500 |
commit | f9dcbcc9e338d08c0f7de7eba4eaafbbb7f81249 (patch) | |
tree | 8a1d9a37bc057440220a5ad23231e0fe974b93f6 /drivers/net/r8169.c | |
parent | 52c793f24054f5dc30d228e37e0e19cc8313f086 (diff) |
net: convert multiple drivers to use netdev_for_each_mc_addr, part5 V2
removed some needless checks and also corrected bug in lp486e (dmi was passed
instead of dmi->dmi_addr)
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/r8169.c')
-rw-r--r-- | drivers/net/r8169.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 83965eeba456..dfc3573c91bb 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
@@ -4732,12 +4732,10 @@ static void rtl_set_rx_mode(struct net_device *dev) | |||
4732 | mc_filter[1] = mc_filter[0] = 0xffffffff; | 4732 | mc_filter[1] = mc_filter[0] = 0xffffffff; |
4733 | } else { | 4733 | } else { |
4734 | struct dev_mc_list *mclist; | 4734 | struct dev_mc_list *mclist; |
4735 | unsigned int i; | ||
4736 | 4735 | ||
4737 | rx_mode = AcceptBroadcast | AcceptMyPhys; | 4736 | rx_mode = AcceptBroadcast | AcceptMyPhys; |
4738 | mc_filter[1] = mc_filter[0] = 0; | 4737 | mc_filter[1] = mc_filter[0] = 0; |
4739 | for (i = 0, mclist = dev->mc_list; mclist && i < netdev_mc_count(dev); | 4738 | netdev_for_each_mc_addr(mclist, dev) { |
4740 | i++, mclist = mclist->next) { | ||
4741 | int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; | 4739 | int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; |
4742 | mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); | 4740 | mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); |
4743 | rx_mode |= AcceptMulticast; | 4741 | rx_mode |= AcceptMulticast; |