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/b44.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/b44.c')
-rw-r--r-- | drivers/net/b44.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 44b66be38134..9091c6574b1c 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c | |||
@@ -1691,7 +1691,7 @@ static int __b44_load_mcast(struct b44 *bp, struct net_device *dev) | |||
1691 | struct dev_mc_list *mclist; | 1691 | struct dev_mc_list *mclist; |
1692 | int i, num_ents; | 1692 | int i, num_ents; |
1693 | 1693 | ||
1694 | num_ents = min_t(int, dev->mc_count, B44_MCAST_TABLE_SIZE); | 1694 | num_ents = min_t(int, netdev_mc_count(dev), B44_MCAST_TABLE_SIZE); |
1695 | mclist = dev->mc_list; | 1695 | mclist = dev->mc_list; |
1696 | for (i = 0; mclist && i < num_ents; i++, mclist = mclist->next) { | 1696 | for (i = 0; mclist && i < num_ents; i++, mclist = mclist->next) { |
1697 | __b44_cam_write(bp, mclist->dmi_addr, i + 1); | 1697 | __b44_cam_write(bp, mclist->dmi_addr, i + 1); |
@@ -1716,7 +1716,7 @@ static void __b44_set_rx_mode(struct net_device *dev) | |||
1716 | __b44_set_mac_addr(bp); | 1716 | __b44_set_mac_addr(bp); |
1717 | 1717 | ||
1718 | if ((dev->flags & IFF_ALLMULTI) || | 1718 | if ((dev->flags & IFF_ALLMULTI) || |
1719 | (dev->mc_count > B44_MCAST_TABLE_SIZE)) | 1719 | (netdev_mc_count(dev) > B44_MCAST_TABLE_SIZE)) |
1720 | val |= RXCONFIG_ALLMULTI; | 1720 | val |= RXCONFIG_ALLMULTI; |
1721 | else | 1721 | else |
1722 | i = __b44_load_mcast(bp, dev); | 1722 | i = __b44_load_mcast(bp, dev); |