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/iseries_veth.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/iseries_veth.c')
-rw-r--r-- | drivers/net/iseries_veth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index 16c91910d6c1..ff015e15f5d1 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c | |||
@@ -958,7 +958,7 @@ static void veth_set_multicast_list(struct net_device *dev) | |||
958 | write_lock_irqsave(&port->mcast_gate, flags); | 958 | write_lock_irqsave(&port->mcast_gate, flags); |
959 | 959 | ||
960 | if ((dev->flags & IFF_PROMISC) || (dev->flags & IFF_ALLMULTI) || | 960 | if ((dev->flags & IFF_PROMISC) || (dev->flags & IFF_ALLMULTI) || |
961 | (dev->mc_count > VETH_MAX_MCAST)) { | 961 | (netdev_mc_count(dev) > VETH_MAX_MCAST)) { |
962 | port->promiscuous = 1; | 962 | port->promiscuous = 1; |
963 | } else { | 963 | } else { |
964 | struct dev_mc_list *dmi = dev->mc_list; | 964 | struct dev_mc_list *dmi = dev->mc_list; |
@@ -969,7 +969,7 @@ static void veth_set_multicast_list(struct net_device *dev) | |||
969 | /* Update table */ | 969 | /* Update table */ |
970 | port->num_mcast = 0; | 970 | port->num_mcast = 0; |
971 | 971 | ||
972 | for (i = 0; i < dev->mc_count; i++) { | 972 | for (i = 0; i < netdev_mc_count(dev); i++) { |
973 | u8 *addr = dmi->dmi_addr; | 973 | u8 *addr = dmi->dmi_addr; |
974 | u64 xaddr = 0; | 974 | u64 xaddr = 0; |
975 | 975 | ||