diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-02-07 23:30:35 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-12 14:38:58 -0500 |
commit | 4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5 (patch) | |
tree | 99f57f6374a58022e1e5ed1cbc12699288c7eae1 /drivers/net/qlge/qlge_main.c | |
parent | 8e5574211d96c0552f84c757718475fdb4021be7 (diff) |
net: use netdev_mc_count and netdev_mc_empty when appropriate
This patch replaces dev->mc_count in all drivers (hopefully I didn't miss
anything). Used spatch and did small tweaks and conding style changes when
it was suitable.
Jirka
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 3cb60e10d456..dd3e0f1b2965 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c | |||
@@ -4221,7 +4221,7 @@ static void qlge_set_multicast_list(struct net_device *ndev) | |||
4221 | * transition is taking place. | 4221 | * transition is taking place. |
4222 | */ | 4222 | */ |
4223 | if ((ndev->flags & IFF_ALLMULTI) || | 4223 | if ((ndev->flags & IFF_ALLMULTI) || |
4224 | (ndev->mc_count > MAX_MULTICAST_ENTRIES)) { | 4224 | (netdev_mc_count(ndev) > MAX_MULTICAST_ENTRIES)) { |
4225 | if (!test_bit(QL_ALLMULTI, &qdev->flags)) { | 4225 | if (!test_bit(QL_ALLMULTI, &qdev->flags)) { |
4226 | if (ql_set_routing_reg | 4226 | if (ql_set_routing_reg |
4227 | (qdev, RT_IDX_ALLMULTI_SLOT, RT_IDX_MCAST, 1)) { | 4227 | (qdev, RT_IDX_ALLMULTI_SLOT, RT_IDX_MCAST, 1)) { |
@@ -4243,7 +4243,7 @@ static void qlge_set_multicast_list(struct net_device *ndev) | |||
4243 | } | 4243 | } |
4244 | } | 4244 | } |
4245 | 4245 | ||
4246 | if (ndev->mc_count) { | 4246 | if (!netdev_mc_empty(ndev)) { |
4247 | status = ql_sem_spinlock(qdev, SEM_MAC_ADDR_MASK); | 4247 | status = ql_sem_spinlock(qdev, SEM_MAC_ADDR_MASK); |
4248 | if (status) | 4248 | if (status) |
4249 | goto exit; | 4249 | goto exit; |