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/davinci_emac.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/davinci_emac.c')
-rw-r--r-- | drivers/net/davinci_emac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index faffad409985..d1e03b5984c0 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c | |||
@@ -956,11 +956,11 @@ static void emac_dev_mcast_set(struct net_device *ndev) | |||
956 | } else { | 956 | } else { |
957 | mbp_enable = (mbp_enable & ~EMAC_MBP_RXPROMISC); | 957 | mbp_enable = (mbp_enable & ~EMAC_MBP_RXPROMISC); |
958 | if ((ndev->flags & IFF_ALLMULTI) || | 958 | if ((ndev->flags & IFF_ALLMULTI) || |
959 | (ndev->mc_count > EMAC_DEF_MAX_MULTICAST_ADDRESSES)) { | 959 | netdev_mc_count(ndev) > EMAC_DEF_MAX_MULTICAST_ADDRESSES) { |
960 | mbp_enable = (mbp_enable | EMAC_MBP_RXMCAST); | 960 | mbp_enable = (mbp_enable | EMAC_MBP_RXMCAST); |
961 | emac_add_mcast(priv, EMAC_ALL_MULTI_SET, NULL); | 961 | emac_add_mcast(priv, EMAC_ALL_MULTI_SET, NULL); |
962 | } | 962 | } |
963 | if (ndev->mc_count > 0) { | 963 | if (!netdev_mc_empty(ndev)) { |
964 | struct dev_mc_list *mc_ptr; | 964 | struct dev_mc_list *mc_ptr; |
965 | mbp_enable = (mbp_enable | EMAC_MBP_RXMCAST); | 965 | mbp_enable = (mbp_enable | EMAC_MBP_RXMCAST); |
966 | emac_add_mcast(priv, EMAC_ALL_MULTI_CLR, NULL); | 966 | emac_add_mcast(priv, EMAC_ALL_MULTI_CLR, NULL); |