include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / net / wireless / orinoco / main.c

diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index 753a1804eee7901f4d4cad5e4ac05aeff6853c53..413e9ab6cab3bb1fb70782f85c07066ec55eac31 100644 (file)
--- a/drivers/net/wireless/orinoco/main.c
+++ b/drivers/net/wireless/orinoco/main.c
@@ -78,6 +78,7 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/device.h>
@@ -1668,16 +1669,15 @@ __orinoco_set_multicast_list(struct net_device *dev)
        /* The Hermes doesn't seem to have an allmulti mode, so we go
         * into promiscuous mode and let the upper levels deal. */
        if ((dev->flags & IFF_PROMISC) || (dev->flags & IFF_ALLMULTI) ||
-           (dev->mc_count > MAX_MULTICAST(priv))) {
+           (netdev_mc_count(dev) > MAX_MULTICAST(priv))) {
                promisc = 1;
                mc_count = 0;
        } else {
                promisc = 0;
-               mc_count = dev->mc_count;
+               mc_count = netdev_mc_count(dev);
        }
 
-       err = __orinoco_hw_set_multicast_list(priv, dev->mc_list, mc_count,
-                                             promisc);
+       err = __orinoco_hw_set_multicast_list(priv, dev, mc_count, promisc);
 
        return err;
 }