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/qlge/qlge_main.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/qlge/qlge_main.c')
-rw-r--r-- | drivers/net/qlge/qlge_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index c170349717c5..c26ec5d740f6 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c | |||
@@ -4270,8 +4270,8 @@ static void qlge_set_multicast_list(struct net_device *ndev) | |||
4270 | status = ql_sem_spinlock(qdev, SEM_MAC_ADDR_MASK); | 4270 | status = ql_sem_spinlock(qdev, SEM_MAC_ADDR_MASK); |
4271 | if (status) | 4271 | if (status) |
4272 | goto exit; | 4272 | goto exit; |
4273 | for (i = 0, mc_ptr = ndev->mc_list; mc_ptr; | 4273 | i = 0; |
4274 | i++, mc_ptr = mc_ptr->next) | 4274 | netdev_for_each_mc_addr(mc_ptr, ndev) { |
4275 | if (ql_set_mac_addr_reg(qdev, (u8 *) mc_ptr->dmi_addr, | 4275 | if (ql_set_mac_addr_reg(qdev, (u8 *) mc_ptr->dmi_addr, |
4276 | MAC_ADDR_TYPE_MULTI_MAC, i)) { | 4276 | MAC_ADDR_TYPE_MULTI_MAC, i)) { |
4277 | netif_err(qdev, hw, qdev->ndev, | 4277 | netif_err(qdev, hw, qdev->ndev, |
@@ -4279,6 +4279,8 @@ static void qlge_set_multicast_list(struct net_device *ndev) | |||
4279 | ql_sem_unlock(qdev, SEM_MAC_ADDR_MASK); | 4279 | ql_sem_unlock(qdev, SEM_MAC_ADDR_MASK); |
4280 | goto exit; | 4280 | goto exit; |
4281 | } | 4281 | } |
4282 | i++; | ||
4283 | } | ||
4282 | ql_sem_unlock(qdev, SEM_MAC_ADDR_MASK); | 4284 | ql_sem_unlock(qdev, SEM_MAC_ADDR_MASK); |
4283 | if (ql_set_routing_reg | 4285 | if (ql_set_routing_reg |
4284 | (qdev, RT_IDX_MCAST_MATCH_SLOT, RT_IDX_MCAST_MATCH, 1)) { | 4286 | (qdev, RT_IDX_MCAST_MATCH_SLOT, RT_IDX_MCAST_MATCH, 1)) { |