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/ipg.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/ipg.c')
-rw-r--r-- | drivers/net/ipg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c index 49f35e2ed19f..dbdebd5efe86 100644 --- a/drivers/net/ipg.c +++ b/drivers/net/ipg.c | |||
@@ -585,11 +585,11 @@ static void ipg_nic_set_multicast_list(struct net_device *dev) | |||
585 | receivemode = IPG_RM_RECEIVEALLFRAMES; | 585 | receivemode = IPG_RM_RECEIVEALLFRAMES; |
586 | } else if ((dev->flags & IFF_ALLMULTI) || | 586 | } else if ((dev->flags & IFF_ALLMULTI) || |
587 | ((dev->flags & IFF_MULTICAST) && | 587 | ((dev->flags & IFF_MULTICAST) && |
588 | (dev->mc_count > IPG_MULTICAST_HASHTABLE_SIZE))) { | 588 | (netdev_mc_count(dev) > IPG_MULTICAST_HASHTABLE_SIZE))) { |
589 | /* NIC to be configured to receive all multicast | 589 | /* NIC to be configured to receive all multicast |
590 | * frames. */ | 590 | * frames. */ |
591 | receivemode |= IPG_RM_RECEIVEMULTICAST; | 591 | receivemode |= IPG_RM_RECEIVEMULTICAST; |
592 | } else if ((dev->flags & IFF_MULTICAST) && (dev->mc_count > 0)) { | 592 | } else if ((dev->flags & IFF_MULTICAST) && !netdev_mc_empty(dev)) { |
593 | /* NIC to be configured to receive selected | 593 | /* NIC to be configured to receive selected |
594 | * multicast addresses. */ | 594 | * multicast addresses. */ |
595 | receivemode |= IPG_RM_RECEIVEMULTICASTHASH; | 595 | receivemode |= IPG_RM_RECEIVEMULTICASTHASH; |