Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index 66813c91a720..ff27f728fd9d 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -18,7 +18,6 @@
 #include <linux/types.h>
 #include <linux/fcntl.h>
 #include <linux/interrupt.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -1413,7 +1412,7 @@ static void enc28j60_set_multicast_list(struct net_device *dev)
                 if (netif_msg_link(priv))
                         dev_info(&dev->dev, "promiscuous mode\n");
                 priv->rxfilter = RXFILTER_PROMISC;
-        } else if ((dev->flags & IFF_ALLMULTI) || dev->mc_count) {
+        } else if ((dev->flags & IFF_ALLMULTI) || !netdev_mc_empty(dev)) {
                 if (netif_msg_link(priv))
                         dev_info(&dev->dev, "%smulticast mode\n",
                                 (dev->flags & IFF_ALLMULTI) ? "all-" : "");