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

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

diff --git a/drivers/net/ni65.c b/drivers/net/ni65.c
index ae19aafd2c7e619cf71673286a28a7b20ea48d14..9225c76cac40fdce9cf83ce5d917fb3439082195 100644 (file)
--- a/drivers/net/ni65.c
+++ b/drivers/net/ni65.c
@@ -849,7 +849,7 @@ static int ni65_lance_reinit(struct net_device *dev)
 
         if(dev->flags & IFF_PROMISC)
                 ni65_init_lance(p,dev->dev_addr,0x00,M_PROM);
-        else if(dev->mc_count || dev->flags & IFF_ALLMULTI)
+        else if (netdev_mc_count(dev) || dev->flags & IFF_ALLMULTI)
                 ni65_init_lance(p,dev->dev_addr,0xff,0x0);
         else
                 ni65_init_lance(p,dev->dev_addr,0x00,0x00);