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

1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index c146304d8d6c..6354ab3a45a6 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -31,6 +31,7 @@
 #include <linux/mii.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #define DRV_NAME        "ks8851_mll"
 
@@ -854,8 +855,8 @@ static void ks_update_link_status(struct net_device *netdev, struct ks_net *ks)
 
 static irqreturn_t ks_irq(int irq, void *pw)
 {
-        struct ks_net *ks = pw;
-        struct net_device *netdev = ks->netdev;
+        struct net_device *netdev = pw;
+        struct ks_net *ks = netdev_priv(netdev);
         u16 status;
 
         /*this should be the first in IRQ handler */
@@ -1193,10 +1194,11 @@ static void ks_set_rx_mode(struct net_device *netdev)
         else
                 ks_set_promis(ks, false);
 
-        if ((netdev->flags & IFF_MULTICAST) && netdev->mc_count) {
-                if (netdev->mc_count <= MAX_MCAST_LST) {
+        if ((netdev->flags & IFF_MULTICAST) && netdev_mc_count(netdev)) {
+                if (netdev_mc_count(netdev) <= MAX_MCAST_LST) {
                         int i = 0;
-                        for (ptr = netdev->mc_list; ptr; ptr = ptr->next) {
+
+                        netdev_for_each_mc_addr(ptr, netdev) {
                                 if (!(*ptr->dmi_addr & 1))
                                         continue;
                                 if (i >= MAX_MCAST_LST)