3 files changed, 11 insertions, 8 deletions

diff --git a/drivers/net/wireless/libertas_tf/cmd.c b/drivers/net/wireless/libertas_tf/cmd.c
index 28790e03dc43..b620daf59ef7 100644
--- a/drivers/net/wireless/libertas_tf/cmd.c
+++ b/drivers/net/wireless/libertas_tf/cmd.c
@@ -7,6 +7,8 @@
  *  the Free Software Foundation; either version 2 of the License, or (at
  *  your option) any later version.
  */
+#include <linux/slab.h>
+
 #include "libertas_tf.h"
 
 static const struct channel_range channel_ranges[] = {
diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/libertas_tf/if_usb.c
index 3691c307e674..8cc9db60c14b 100644
--- a/drivers/net/wireless/libertas_tf/if_usb.c
+++ b/drivers/net/wireless/libertas_tf/if_usb.c
@@ -11,6 +11,7 @@
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
 #include <linux/netdevice.h>
+#include <linux/slab.h>
 #include <linux/usb.h>
 
 #define DRV_NAME "lbtf_usb"
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c
index 6ab30033c26c..7533a23e0500 100644
--- a/drivers/net/wireless/libertas_tf/main.c
+++ b/drivers/net/wireless/libertas_tf/main.c
@@ -7,6 +7,8 @@
  *  the Free Software Foundation; either version 2 of the License, or (at
  *  your option) any later version.
  */
+#include <linux/slab.h>
+
 #include "libertas_tf.h"
 #include "linux/etherdevice.h"
 
@@ -367,22 +369,20 @@ static int lbtf_op_config(struct ieee80211_hw *hw, u32 changed)
 }
 
 static u64 lbtf_op_prepare_multicast(struct ieee80211_hw *hw,
-                                     int mc_count, struct dev_addr_list *mclist)
+                                     struct netdev_hw_addr_list *mc_list)
 {
         struct lbtf_private *priv = hw->priv;
         int i;
+        struct netdev_hw_addr *ha;
+        int mc_count = netdev_hw_addr_list_count(mc_list);
 
         if (!mc_count || mc_count > MRVDRV_MAX_MULTICAST_LIST_SIZE)
                 return mc_count;
 
         priv->nr_of_multicastmacaddr = mc_count;
-        for (i = 0; i < mc_count; i++) {
-                if (!mclist)
-                        break;
-                memcpy(&priv->multicastlist[i], mclist->da_addr,
-                                ETH_ALEN);
-                mclist = mclist->next;
-        }
+        i = 0;
+        netdev_hw_addr_list_for_each(ha, mc_list)
+                memcpy(&priv->multicastlist[i++], ha->addr, ETH_ALEN);
 
         return mc_count;
 }