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/fs_enet | |
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/fs_enet')
-rw-r--r-- | drivers/net/fs_enet/mac-fcc.c | 2 | ||||
-rw-r--r-- | drivers/net/fs_enet/mac-fec.c | 2 | ||||
-rw-r--r-- | drivers/net/fs_enet/mac-scc.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c index 22e5a847a588..482f27d5f7d4 100644 --- a/drivers/net/fs_enet/mac-fcc.c +++ b/drivers/net/fs_enet/mac-fcc.c | |||
@@ -218,7 +218,7 @@ static void set_multicast_finish(struct net_device *dev) | |||
218 | 218 | ||
219 | /* if all multi or too many multicasts; just enable all */ | 219 | /* if all multi or too many multicasts; just enable all */ |
220 | if ((dev->flags & IFF_ALLMULTI) != 0 || | 220 | if ((dev->flags & IFF_ALLMULTI) != 0 || |
221 | dev->mc_count > FCC_MAX_MULTICAST_ADDRS) { | 221 | netdev_mc_count(dev) > FCC_MAX_MULTICAST_ADDRS) { |
222 | 222 | ||
223 | W32(ep, fen_gaddrh, 0xffffffff); | 223 | W32(ep, fen_gaddrh, 0xffffffff); |
224 | W32(ep, fen_gaddrl, 0xffffffff); | 224 | W32(ep, fen_gaddrl, 0xffffffff); |
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c index ca7bcb8ab3a1..ddf13ef8ac87 100644 --- a/drivers/net/fs_enet/mac-fec.c +++ b/drivers/net/fs_enet/mac-fec.c | |||
@@ -220,7 +220,7 @@ static void set_multicast_finish(struct net_device *dev) | |||
220 | 220 | ||
221 | /* if all multi or too many multicasts; just enable all */ | 221 | /* if all multi or too many multicasts; just enable all */ |
222 | if ((dev->flags & IFF_ALLMULTI) != 0 || | 222 | if ((dev->flags & IFF_ALLMULTI) != 0 || |
223 | dev->mc_count > FEC_MAX_MULTICAST_ADDRS) { | 223 | netdev_mc_count(dev) > FEC_MAX_MULTICAST_ADDRS) { |
224 | fep->fec.hthi = 0xffffffffU; | 224 | fep->fec.hthi = 0xffffffffU; |
225 | fep->fec.htlo = 0xffffffffU; | 225 | fep->fec.htlo = 0xffffffffU; |
226 | } | 226 | } |
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c index 008cdd9cc536..141dbc91e5e7 100644 --- a/drivers/net/fs_enet/mac-scc.c +++ b/drivers/net/fs_enet/mac-scc.c | |||
@@ -213,7 +213,7 @@ static void set_multicast_finish(struct net_device *dev) | |||
213 | 213 | ||
214 | /* if all multi or too many multicasts; just enable all */ | 214 | /* if all multi or too many multicasts; just enable all */ |
215 | if ((dev->flags & IFF_ALLMULTI) != 0 || | 215 | if ((dev->flags & IFF_ALLMULTI) != 0 || |
216 | dev->mc_count > SCC_MAX_MULTICAST_ADDRS) { | 216 | netdev_mc_count(dev) > SCC_MAX_MULTICAST_ADDRS) { |
217 | 217 | ||
218 | W16(ep, sen_gaddr1, 0xffff); | 218 | W16(ep, sen_gaddr1, 0xffff); |
219 | W16(ep, sen_gaddr2, 0xffff); | 219 | W16(ep, sen_gaddr2, 0xffff); |