aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e100.c
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2010-02-07 23:30:35 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-12 14:38:58 -0500
commit4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5 (patch)
tree99f57f6374a58022e1e5ed1cbc12699288c7eae1 /drivers/net/e100.c
parent8e5574211d96c0552f84c757718475fdb4021be7 (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/e100.c')
-rw-r--r--drivers/net/e100.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 5c7a155e849a..e8c0e823a06f 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1538,7 +1538,7 @@ static void e100_multi(struct nic *nic, struct cb *cb, struct sk_buff *skb)
1538{ 1538{
1539 struct net_device *netdev = nic->netdev; 1539 struct net_device *netdev = nic->netdev;
1540 struct dev_mc_list *list = netdev->mc_list; 1540 struct dev_mc_list *list = netdev->mc_list;
1541 u16 i, count = min(netdev->mc_count, E100_MAX_MULTICAST_ADDRS); 1541 u16 i, count = min(netdev_mc_count(netdev), E100_MAX_MULTICAST_ADDRS);
1542 1542
1543 cb->command = cpu_to_le16(cb_multi); 1543 cb->command = cpu_to_le16(cb_multi);
1544 cb->u.multi.count = cpu_to_le16(count * ETH_ALEN); 1544 cb->u.multi.count = cpu_to_le16(count * ETH_ALEN);
@@ -1552,7 +1552,7 @@ static void e100_set_multicast_list(struct net_device *netdev)
1552 struct nic *nic = netdev_priv(netdev); 1552 struct nic *nic = netdev_priv(netdev);
1553 1553
1554 DPRINTK(HW, DEBUG, "mc_count=%d, flags=0x%04X\n", 1554 DPRINTK(HW, DEBUG, "mc_count=%d, flags=0x%04X\n",
1555 netdev->mc_count, netdev->flags); 1555 netdev_mc_count(netdev), netdev->flags);
1556 1556
1557 if (netdev->flags & IFF_PROMISC) 1557 if (netdev->flags & IFF_PROMISC)
1558 nic->flags |= promiscuous; 1558 nic->flags |= promiscuous;
@@ -1560,7 +1560,7 @@ static void e100_set_multicast_list(struct net_device *netdev)
1560 nic->flags &= ~promiscuous; 1560 nic->flags &= ~promiscuous;
1561 1561
1562 if (netdev->flags & IFF_ALLMULTI || 1562 if (netdev->flags & IFF_ALLMULTI ||
1563 netdev->mc_count > E100_MAX_MULTICAST_ADDRS) 1563 netdev_mc_count(netdev) > E100_MAX_MULTICAST_ADDRS)
1564 nic->flags |= multicast_all; 1564 nic->flags |= multicast_all;
1565 else 1565 else
1566 nic->flags &= ~multicast_all; 1566 nic->flags &= ~multicast_all;