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/tulip/de4x5.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/tulip/de4x5.c')
-rw-r--r-- | drivers/net/tulip/de4x5.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c index a8349b7200b5..0b6a9731091c 100644 --- a/drivers/net/tulip/de4x5.c +++ b/drivers/net/tulip/de4x5.c | |||
@@ -1963,10 +1963,10 @@ SetMulticastFilter(struct net_device *dev) | |||
1963 | omr &= ~(OMR_PR | OMR_PM); | 1963 | omr &= ~(OMR_PR | OMR_PM); |
1964 | pa = build_setup_frame(dev, ALL); /* Build the basic frame */ | 1964 | pa = build_setup_frame(dev, ALL); /* Build the basic frame */ |
1965 | 1965 | ||
1966 | if ((dev->flags & IFF_ALLMULTI) || (dev->mc_count > 14)) { | 1966 | if ((dev->flags & IFF_ALLMULTI) || (netdev_mc_count(dev) > 14)) { |
1967 | omr |= OMR_PM; /* Pass all multicasts */ | 1967 | omr |= OMR_PM; /* Pass all multicasts */ |
1968 | } else if (lp->setup_f == HASH_PERF) { /* Hash Filtering */ | 1968 | } else if (lp->setup_f == HASH_PERF) { /* Hash Filtering */ |
1969 | for (i=0;i<dev->mc_count;i++) { /* for each address in the list */ | 1969 | for (i = 0; i < netdev_mc_count(dev) ;i++) { |
1970 | addrs=dmi->dmi_addr; | 1970 | addrs=dmi->dmi_addr; |
1971 | dmi=dmi->next; | 1971 | dmi=dmi->next; |
1972 | if ((*addrs & 0x01) == 1) { /* multicast address? */ | 1972 | if ((*addrs & 0x01) == 1) { /* multicast address? */ |
@@ -1984,7 +1984,7 @@ SetMulticastFilter(struct net_device *dev) | |||
1984 | } | 1984 | } |
1985 | } | 1985 | } |
1986 | } else { /* Perfect filtering */ | 1986 | } else { /* Perfect filtering */ |
1987 | for (j=0; j<dev->mc_count; j++) { | 1987 | for (j=0; j<netdev_mc_count(dev); j++) { |
1988 | addrs=dmi->dmi_addr; | 1988 | addrs=dmi->dmi_addr; |
1989 | dmi=dmi->next; | 1989 | dmi=dmi->next; |
1990 | for (i=0; i<ETH_ALEN; i++) { | 1990 | for (i=0; i<ETH_ALEN; i++) { |