Merge branch 'drm-fbdev-cleanup' into drm-core-next

[mv-sheeva.git] / drivers / net / ps3_gelic_net.c

diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index 0c768593aad00aa24708f949ab16cceecdce40ac..5bf229bb34c26e55879ddc62e13be82183e028c7 100644 (file)
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -30,6 +30,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
@@ -568,7 +569,7 @@ void gelic_net_set_multi(struct net_device *netdev)
                        status);
 
        if ((netdev->flags & IFF_ALLMULTI) ||
-           (netdev->mc_count > GELIC_NET_MC_COUNT_MAX)) {
+           (netdev_mc_count(netdev) > GELIC_NET_MC_COUNT_MAX)) {
                status = lv1_net_add_multicast_address(bus_id(card),
                                                       dev_id(card),
                                                       0, 1);
@@ -580,7 +581,7 @@ void gelic_net_set_multi(struct net_device *netdev)
        }
 
        /* set multicast addresses */
-       for (mc = netdev->mc_list; mc; mc = mc->next) {
+       netdev_for_each_mc_addr(mc, netdev) {
                addr = 0;
                p = mc->dmi_addr;
                for (i = 0; i < ETH_ALEN; i++) {