2 files changed, 21 insertions, 11 deletions

diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.c b/drivers/net/wireless/wl12xx/wl1271_cmd.c
index 035ddc06034c..d005729e0312 100644
--- a/drivers/net/wireless/wl12xx/wl1271_cmd.c
+++ b/drivers/net/wireless/wl12xx/wl1271_cmd.c
@@ -709,18 +709,30 @@ out:
 
 int wl1271_cmd_build_null_data(struct wl1271 *wl)
 {
-        struct sk_buff *skb;
-        int ret = 0;
+        struct sk_buff *skb = NULL;
+        int size;
+        void *ptr;
+        int ret = -ENOMEM;
 
-        skb = ieee80211_nullfunc_get(wl->hw, wl->vif);
-        if (!skb)
-                goto out;
 
-        ret = wl1271_cmd_template_set(wl, CMD_TEMPL_NULL_DATA, skb->data,
-                                      skb->len);
+        if (wl->bss_type == BSS_TYPE_IBSS) {
+                size = sizeof(struct wl12xx_null_data_template);
+                ptr = NULL;
+        } else {
+                skb = ieee80211_nullfunc_get(wl->hw, wl->vif);
+                if (!skb)
+                        goto out;
+                size = skb->len;
+                ptr = skb->data;
+        }
+
+        ret = wl1271_cmd_template_set(wl, CMD_TEMPL_NULL_DATA, ptr, size);
 
 out:
         dev_kfree_skb(skb);
+        if (ret)
+                wl1271_warning("cmd buld null data failed %d", ret);
+
         return ret;
 
 }
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index befc2e9b1842..6f6d366491a3 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -1619,12 +1619,10 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,
              */
             memcmp(wl->bssid, bss_conf->bssid, ETH_ALEN)) {
                         memcpy(wl->bssid, bss_conf->bssid, ETH_ALEN);
+
                         ret = wl1271_cmd_build_null_data(wl);
-                        if (ret < 0) {
-                                wl1271_warning("cmd buld null data failed %d",
-                                               ret);
+                        if (ret < 0)
                                 goto out_sleep;
-                        }
 
                         /* filter out all packets not from this BSSID */
                         wl1271_configure_filters(wl, 0);