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/isa-skeleton.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/isa-skeleton.c')
-rw-r--r-- | drivers/net/isa-skeleton.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/isa-skeleton.c b/drivers/net/isa-skeleton.c index 04d0502726c..bb4a3cda6e4 100644 --- a/drivers/net/isa-skeleton.c +++ b/drivers/net/isa-skeleton.c | |||
@@ -655,14 +655,15 @@ set_multicast_list(struct net_device *dev) | |||
655 | /* Enable promiscuous mode */ | 655 | /* Enable promiscuous mode */ |
656 | outw(MULTICAST|PROMISC, ioaddr); | 656 | outw(MULTICAST|PROMISC, ioaddr); |
657 | } | 657 | } |
658 | else if((dev->flags&IFF_ALLMULTI) || dev->mc_count > HW_MAX_ADDRS) | 658 | else if ((dev->flags&IFF_ALLMULTI) || |
659 | netdev_mc_count(dev) > HW_MAX_ADDRS) | ||
659 | { | 660 | { |
660 | /* Disable promiscuous mode, use normal mode. */ | 661 | /* Disable promiscuous mode, use normal mode. */ |
661 | hardware_set_filter(NULL); | 662 | hardware_set_filter(NULL); |
662 | 663 | ||
663 | outw(MULTICAST, ioaddr); | 664 | outw(MULTICAST, ioaddr); |
664 | } | 665 | } |
665 | else if(dev->mc_count) | 666 | else if (!netdev_mc_empty(dev)) |
666 | { | 667 | { |
667 | /* Walk the address list, and load the filter */ | 668 | /* Walk the address list, and load the filter */ |
668 | hardware_set_filter(dev->mc_list); | 669 | hardware_set_filter(dev->mc_list); |