Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

[karo-tx-linux.git] / drivers / net / isa-skeleton.c

diff --git a/drivers/net/isa-skeleton.c b/drivers/net/isa-skeleton.c
index 04d0502726c07dccb2040395437091a53791222e..d09e4d3a15a69eafbcd0472ee3c0d6d734f20464 100644 (file)
--- a/drivers/net/isa-skeleton.c
+++ b/drivers/net/isa-skeleton.c
@@ -655,17 +655,18 @@ set_multicast_list(struct net_device *dev)
                /* Enable promiscuous mode */
                outw(MULTICAST|PROMISC, ioaddr);
        }
-       else if((dev->flags&IFF_ALLMULTI) || dev->mc_count > HW_MAX_ADDRS)
+       else if ((dev->flags&IFF_ALLMULTI) ||
+                netdev_mc_count(dev) > HW_MAX_ADDRS)
        {
                /* Disable promiscuous mode, use normal mode. */
                hardware_set_filter(NULL);
 
                outw(MULTICAST, ioaddr);
        }
-       else if(dev->mc_count)
+       else if (!netdev_mc_empty(dev))
        {
                /* Walk the address list, and load the filter */
-               hardware_set_filter(dev->mc_list);
+               hardware_set_filter(dev);
 
                outw(MULTICAST, ioaddr);
        }