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/wireless/rndis_wlan.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/wireless/rndis_wlan.c')
-rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index 305c106fdc1c..14692bc51b51 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
@@ -1492,10 +1492,10 @@ static void set_multicast_list(struct usbnet *usbdev) | |||
1492 | filter |= RNDIS_PACKET_TYPE_PROMISCUOUS | | 1492 | filter |= RNDIS_PACKET_TYPE_PROMISCUOUS | |
1493 | RNDIS_PACKET_TYPE_ALL_LOCAL; | 1493 | RNDIS_PACKET_TYPE_ALL_LOCAL; |
1494 | } else if (usbdev->net->flags & IFF_ALLMULTI || | 1494 | } else if (usbdev->net->flags & IFF_ALLMULTI || |
1495 | usbdev->net->mc_count > priv->multicast_size) { | 1495 | netdev_mc_count(usbdev->net) > priv->multicast_size) { |
1496 | filter |= RNDIS_PACKET_TYPE_ALL_MULTICAST; | 1496 | filter |= RNDIS_PACKET_TYPE_ALL_MULTICAST; |
1497 | } else if (usbdev->net->mc_count > 0) { | 1497 | } else if (!netdev_mc_empty(usbdev->net)) { |
1498 | size = min(priv->multicast_size, usbdev->net->mc_count); | 1498 | size = min(priv->multicast_size, netdev_mc_count(usbdev->net)); |
1499 | buf = kmalloc(size * ETH_ALEN, GFP_KERNEL); | 1499 | buf = kmalloc(size * ETH_ALEN, GFP_KERNEL); |
1500 | if (!buf) { | 1500 | if (!buf) { |
1501 | devwarn(usbdev, | 1501 | devwarn(usbdev, |