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/mac89x0.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/mac89x0.c')
-rw-r--r-- | drivers/net/mac89x0.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c index 23b633e2ac42..c292a608f9a9 100644 --- a/drivers/net/mac89x0.c +++ b/drivers/net/mac89x0.c | |||
@@ -568,9 +568,7 @@ static void set_multicast_list(struct net_device *dev) | |||
568 | if(dev->flags&IFF_PROMISC) | 568 | if(dev->flags&IFF_PROMISC) |
569 | { | 569 | { |
570 | lp->rx_mode = RX_ALL_ACCEPT; | 570 | lp->rx_mode = RX_ALL_ACCEPT; |
571 | } | 571 | } else if ((dev->flags & IFF_ALLMULTI) || !netdev_mc_empty(dev)) { |
572 | else if((dev->flags&IFF_ALLMULTI)||dev->mc_list) | ||
573 | { | ||
574 | /* The multicast-accept list is initialized to accept-all, and we | 572 | /* The multicast-accept list is initialized to accept-all, and we |
575 | rely on higher-level filtering for now. */ | 573 | rely on higher-level filtering for now. */ |
576 | lp->rx_mode = RX_MULTCAST_ACCEPT; | 574 | lp->rx_mode = RX_MULTCAST_ACCEPT; |