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/pci-skeleton.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/pci-skeleton.c')
-rw-r--r-- | drivers/net/pci-skeleton.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c index 11d4398eac94..36785853a149 100644 --- a/drivers/net/pci-skeleton.c +++ b/drivers/net/pci-skeleton.c | |||
@@ -1793,7 +1793,7 @@ static void netdrv_set_rx_mode(struct net_device *dev) | |||
1793 | struct netdrv_private *tp = netdev_priv(dev); | 1793 | struct netdrv_private *tp = netdev_priv(dev); |
1794 | void *ioaddr = tp->mmio_addr; | 1794 | void *ioaddr = tp->mmio_addr; |
1795 | u32 mc_filter[2]; /* Multicast hash filter */ | 1795 | u32 mc_filter[2]; /* Multicast hash filter */ |
1796 | int i, rx_mode; | 1796 | int rx_mode; |
1797 | u32 tmp; | 1797 | u32 tmp; |
1798 | 1798 | ||
1799 | DPRINTK("ENTER\n"); | 1799 | DPRINTK("ENTER\n"); |
@@ -1814,10 +1814,10 @@ static void netdrv_set_rx_mode(struct net_device *dev) | |||
1814 | mc_filter[1] = mc_filter[0] = 0xffffffff; | 1814 | mc_filter[1] = mc_filter[0] = 0xffffffff; |
1815 | } else { | 1815 | } else { |
1816 | struct dev_mc_list *mclist; | 1816 | struct dev_mc_list *mclist; |
1817 | |||
1817 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; | 1818 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; |
1818 | mc_filter[1] = mc_filter[0] = 0; | 1819 | mc_filter[1] = mc_filter[0] = 0; |
1819 | for (i = 0, mclist = dev->mc_list; mclist && i < netdev_mc_count(dev); | 1820 | netdev_for_each_mc_addr(mclist, dev) { |
1820 | i++, mclist = mclist->next) { | ||
1821 | int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; | 1821 | int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; |
1822 | 1822 | ||
1823 | mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); | 1823 | mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); |