tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

net: 8139too: convert to use mc helpers

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Jiri Pirko and committed by
David S. Miller 6d55ad4a a56ed41d

+3 -4
+3 -4
drivers/net/8139too.c
··· 2509 2509 struct rtl8139_private *tp = netdev_priv(dev); 2510 2510 void __iomem *ioaddr = tp->mmio_addr; 2511 2511 u32 mc_filter[2]; /* Multicast hash filter */ 2512 - int i, rx_mode; 2512 + int rx_mode; 2513 2513 u32 tmp; 2514 2514 2515 2515 pr_debug("%s: rtl8139_set_rx_mode(%4.4x) done -- Rx config %8.8lx.\n", ··· 2521 2521 AcceptBroadcast | AcceptMulticast | AcceptMyPhys | 2522 2522 AcceptAllPhys; 2523 2523 mc_filter[1] = mc_filter[0] = 0xffffffff; 2524 - } else if ((dev->mc_count > multicast_filter_limit) || 2524 + } else if ((netdev_mc_count(dev) > multicast_filter_limit) || 2525 2525 (dev->flags & IFF_ALLMULTI)) { 2526 2526 /* Too many to filter perfectly -- accept all multicasts. */ 2527 2527 rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; ··· 2530 2530 struct dev_mc_list *mclist; 2531 2531 rx_mode = AcceptBroadcast | AcceptMyPhys; 2532 2532 mc_filter[1] = mc_filter[0] = 0; 2533 - for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count; 2534 - i++, mclist = mclist->next) { 2533 + netdev_for_each_mc_addr(mclist, dev) { 2535 2534 int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; 2536 2535 2537 2536 mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);