diff options
| author |   Jiri Pirko <jpirko@redhat.com> | 2010-02-08 04:30:35 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-02-12 11:38:58 -0800 |
| commit | 4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5 (patch) | |
| tree | 99f57f6374a58022e1e5ed1cbc12699288c7eae1 /drivers/net/3c527.c | |
| parent | ethtool: Use explicit designated initializers for .cmd (diff) | |
| download | linux-dev-4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5.tar.xz linux-dev-4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5.zip | |
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/3c527.c')
| -rw-r--r-- | drivers/net/3c527.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c index 36c4191e7bca..ce9826980517 100644 --- a/drivers/net/3c527.c +++ b/drivers/net/3c527.c @@ -1526,10 +1526,10 @@ static void do_mc32_set_multicast_list(struct net_device *dev, int retry) if ((dev->flags&IFF_PROMISC) || (dev->flags&IFF_ALLMULTI) || - dev->mc_count > 10) + netdev_mc_count(dev) > 10) /* Enable promiscuous mode */ filt |= 1; - else if(dev->mc_count) + else if (!netdev_mc_empty(dev)) { unsigned char block[62]; unsigned char *bp; @@ -1542,16 +1542,17 @@ static void do_mc32_set_multicast_list(struct net_device *dev, int retry) if(!lp->mc_list_valid) { block[1]=0; - block[0]=dev->mc_count; + block[0]=netdev_mc_count(dev); bp=block+2; - for(i=0;i<dev->mc_count;i++) + for(i=0;i<netdev_mc_count(dev);i++) { memcpy(bp, dmc->dmi_addr, 6); bp+=6; dmc=dmc->next; } - if(mc32_command_nowait(dev, 2, block, 2+6*dev->mc_count)==-1) + if(mc32_command_nowait(dev, 2, block, + 2+6*netdev_mc_count(dev))==-1) { lp->mc_reload_wait = 1; return; |