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>
This commit is contained in:

committed by
David S. Miller

parent
8e5574211d
commit
4cd24eaf0c
@@ -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;
|
||||
|
Reference in New Issue
Block a user