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/pcnet32.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/pcnet32.c')
-rw-r--r-- | drivers/net/pcnet32.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index 63e03159daf7..084d78dd1637 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c | |||
@@ -2590,7 +2590,7 @@ static void pcnet32_load_multicast(struct net_device *dev) | |||
2590 | struct pcnet32_private *lp = netdev_priv(dev); | 2590 | struct pcnet32_private *lp = netdev_priv(dev); |
2591 | volatile struct pcnet32_init_block *ib = lp->init_block; | 2591 | volatile struct pcnet32_init_block *ib = lp->init_block; |
2592 | volatile __le16 *mcast_table = (__le16 *)ib->filter; | 2592 | volatile __le16 *mcast_table = (__le16 *)ib->filter; |
2593 | struct dev_mc_list *dmi = dev->mc_list; | 2593 | struct dev_mc_list *dmi; |
2594 | unsigned long ioaddr = dev->base_addr; | 2594 | unsigned long ioaddr = dev->base_addr; |
2595 | char *addrs; | 2595 | char *addrs; |
2596 | int i; | 2596 | int i; |
@@ -2611,9 +2611,8 @@ static void pcnet32_load_multicast(struct net_device *dev) | |||
2611 | ib->filter[1] = 0; | 2611 | ib->filter[1] = 0; |
2612 | 2612 | ||
2613 | /* Add addresses */ | 2613 | /* Add addresses */ |
2614 | for (i = 0; i < netdev_mc_count(dev); i++) { | 2614 | netdev_for_each_mc_addr(dmi, dev) { |
2615 | addrs = dmi->dmi_addr; | 2615 | addrs = dmi->dmi_addr; |
2616 | dmi = dmi->next; | ||
2617 | 2616 | ||
2618 | /* multicast address? */ | 2617 | /* multicast address? */ |
2619 | if (!(*addrs & 1)) | 2618 | if (!(*addrs & 1)) |