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/ksz884x.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/ksz884x.c')
-rw-r--r-- | drivers/net/ksz884x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c index 6f187c7e61fa..7264a3e5c2c0 100644 --- a/drivers/net/ksz884x.c +++ b/drivers/net/ksz884x.c | |||
@@ -5777,7 +5777,7 @@ static void netdev_set_rx_mode(struct net_device *dev) | |||
5777 | if (hw_priv->hw.dev_count > 1) | 5777 | if (hw_priv->hw.dev_count > 1) |
5778 | return; | 5778 | return; |
5779 | 5779 | ||
5780 | if ((dev->flags & IFF_MULTICAST) && dev->mc_count) { | 5780 | if ((dev->flags & IFF_MULTICAST) && !netdev_mc_empty(dev)) { |
5781 | int i = 0; | 5781 | int i = 0; |
5782 | 5782 | ||
5783 | /* List too big to support so turn on all multicast mode. */ | 5783 | /* List too big to support so turn on all multicast mode. */ |
@@ -5790,7 +5790,7 @@ static void netdev_set_rx_mode(struct net_device *dev) | |||
5790 | return; | 5790 | return; |
5791 | } | 5791 | } |
5792 | 5792 | ||
5793 | for (mc_ptr = dev->mc_list; mc_ptr; mc_ptr = mc_ptr->next) { | 5793 | netdev_for_each_mc_addr(mc_ptr, dev) { |
5794 | if (!(*mc_ptr->dmi_addr & 1)) | 5794 | if (!(*mc_ptr->dmi_addr & 1)) |
5795 | continue; | 5795 | continue; |
5796 | if (i >= MAX_MULTICAST_LIST) | 5796 | if (i >= MAX_MULTICAST_LIST) |