From 3cc70d593f3ce224054f59112309c85a1a098dea Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Fri, 5 Feb 2010 02:48:11 +0000 Subject: [PATCH] --- yaml --- r: 183975 b: refs/heads/master c: 6d55ad4a534e7de3417819c6e894ff1c0a38f626 h: refs/heads/master i: 183973: 670c9128b9208aa34ab9d6d65d5ea393901e91f4 183971: 8c9a0c8e7c2dfe8c595efc155f9976795097caa7 183967: a9ae9ce646af034bcdd2ca1d972dd01c743fd720 v: v3 --- [refs] | 2 +- trunk/drivers/net/8139too.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f69b5a92ac0f..47a12de1ea16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a56ed41d94f80e4342116318754878a045835f40 +refs/heads/master: 6d55ad4a534e7de3417819c6e894ff1c0a38f626 diff --git a/trunk/drivers/net/8139too.c b/trunk/drivers/net/8139too.c index 321e73aabb2b..c7d6f094cc7a 100644 --- a/trunk/drivers/net/8139too.c +++ b/trunk/drivers/net/8139too.c @@ -2509,7 +2509,7 @@ static void __set_rx_mode (struct net_device *dev) struct rtl8139_private *tp = netdev_priv(dev); void __iomem *ioaddr = tp->mmio_addr; u32 mc_filter[2]; /* Multicast hash filter */ - int i, rx_mode; + int rx_mode; u32 tmp; pr_debug("%s: rtl8139_set_rx_mode(%4.4x) done -- Rx config %8.8lx.\n", @@ -2521,7 +2521,7 @@ static void __set_rx_mode (struct net_device *dev) AcceptBroadcast | AcceptMulticast | AcceptMyPhys | AcceptAllPhys; mc_filter[1] = mc_filter[0] = 0xffffffff; - } else if ((dev->mc_count > multicast_filter_limit) || + } else if ((netdev_mc_count(dev) > multicast_filter_limit) || (dev->flags & IFF_ALLMULTI)) { /* Too many to filter perfectly -- accept all multicasts. */ rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; @@ -2530,8 +2530,7 @@ static void __set_rx_mode (struct net_device *dev) struct dev_mc_list *mclist; rx_mode = AcceptBroadcast | AcceptMyPhys; mc_filter[1] = mc_filter[0] = 0; - for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count; - i++, mclist = mclist->next) { + netdev_for_each_mc_addr(mclist, dev) { int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);