aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/lib82596.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/lib82596.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/lib82596.c')
-rw-r--r--drivers/net/lib82596.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c
index b60efd4bd017..371b58b1d151 100644
--- a/drivers/net/lib82596.c
+++ b/drivers/net/lib82596.c
@@ -1380,21 +1380,21 @@ static void set_multicast_list(struct net_device *dev)
1380 } 1380 }
1381 } 1381 }
1382 1382
1383 cnt = dev->mc_count; 1383 cnt = netdev_mc_count(dev);
1384 if (cnt > MAX_MC_CNT) { 1384 if (cnt > MAX_MC_CNT) {
1385 cnt = MAX_MC_CNT; 1385 cnt = MAX_MC_CNT;
1386 printk(KERN_NOTICE "%s: Only %d multicast addresses supported", 1386 printk(KERN_NOTICE "%s: Only %d multicast addresses supported",
1387 dev->name, cnt); 1387 dev->name, cnt);
1388 } 1388 }
1389 1389
1390 if (dev->mc_count > 0) { 1390 if (!netdev_mc_empty(dev)) {
1391 struct dev_mc_list *dmi; 1391 struct dev_mc_list *dmi;
1392 unsigned char *cp; 1392 unsigned char *cp;
1393 struct mc_cmd *cmd; 1393 struct mc_cmd *cmd;
1394 1394
1395 cmd = &dma->mc_cmd; 1395 cmd = &dma->mc_cmd;
1396 cmd->cmd.command = SWAP16(CmdMulticastList); 1396 cmd->cmd.command = SWAP16(CmdMulticastList);
1397 cmd->mc_cnt = SWAP16(dev->mc_count * 6); 1397 cmd->mc_cnt = SWAP16(netdev_mc_count(dev) * 6);
1398 cp = cmd->mc_addrs; 1398 cp = cmd->mc_addrs;
1399 for (dmi = dev->mc_list; 1399 for (dmi = dev->mc_list;
1400 cnt && dmi != NULL; 1400 cnt && dmi != NULL;