1 files changed, 10 insertions, 8 deletions

diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
index bc81974a2bc7..9d1277874645 100644
--- a/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@ -14,6 +14,7 @@
 
 #include <linux/module.h>
 #include <linux/usb.h>
+#include <linux/slab.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/wireless.h>
@@ -112,6 +113,9 @@ exit:
         return err;
 }
 
+MODULE_FIRMWARE("zd1201-ap.fw");
+MODULE_FIRMWARE("zd1201.fw");
+
 static void zd1201_usbfree(struct urb *urb)
 {
         struct zd1201 *zd = urb->context;
@@ -872,20 +876,18 @@ static struct iw_statistics *zd1201_get_wireless_stats(struct net_device *dev)
 static void zd1201_set_multicast(struct net_device *dev)
 {
         struct zd1201 *zd = netdev_priv(dev);
-        struct dev_mc_list *mc = dev->mc_list;
+        struct dev_mc_list *mc;
         unsigned char reqbuf[ETH_ALEN*ZD1201_MAXMULTI];
         int i;
 
-        if (dev->mc_count > ZD1201_MAXMULTI)
+        if (netdev_mc_count(dev) > ZD1201_MAXMULTI)
                 return;
 
-        for (i=0; i<dev->mc_count; i++) {
-                memcpy(reqbuf+i*ETH_ALEN, mc->dmi_addr, ETH_ALEN);
-                mc = mc->next;
-        }
+        i = 0;
+        netdev_for_each_mc_addr(mc, dev)
+                memcpy(reqbuf + i++ * ETH_ALEN, mc->dmi_addr, ETH_ALEN);
         zd1201_setconfig(zd, ZD1201_RID_CNFGROUPADDRESS, reqbuf,
-            dev->mc_count*ETH_ALEN, 0);
-        
+                         netdev_mc_count(dev) * ETH_ALEN, 0);
 }
 
 static int zd1201_config_commit(struct net_device *dev,