3 files changed, 10 insertions, 9 deletions

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 0da9ddc8b6cf..006e17458130 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -3525,11 +3525,12 @@ sta_not_found:
                         /*
                          * Get a template for hardware connection maintenance
                          */
-                        dev_kfree_skb(wl->probereq);
-                        wl->probereq = wl1271_cmd_build_ap_probe_req(wl, NULL);
+                        dev_kfree_skb(wlvif->probereq);
+                        wlvif->probereq = wl1271_cmd_build_ap_probe_req(wl,
+                                                                        NULL);
                         ieoffset = offsetof(struct ieee80211_mgmt,
                                             u.probe_req.variable);
-                        wl1271_ssid_set(vif, wl->probereq, ieoffset);
+                        wl1271_ssid_set(vif, wlvif->probereq, ieoffset);
 
                         /* enable the connection monitoring feature */
                         ret = wl1271_acx_conn_monit_params(wl, true);
@@ -3546,8 +3547,8 @@ sta_not_found:
                         wl->aid = 0;
 
                         /* free probe-request template */
-                        dev_kfree_skb(wl->probereq);
-                        wl->probereq = NULL;
+                        dev_kfree_skb(wlvif->probereq);
+                        wlvif->probereq = NULL;
 
                         /* re-enable dynamic ps - just in case */
                         ieee80211_enable_dyn_ps(wl->vif);
diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c
index 197d2c2b1e74..e3b863b895f3 100644
--- a/drivers/net/wireless/wl12xx/scan.c
+++ b/drivers/net/wireless/wl12xx/scan.c
@@ -64,7 +64,7 @@ void wl1271_scan_complete_work(struct work_struct *work)
 
         if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags)) {
                 /* restore hardware connection monitoring template */
-                wl1271_cmd_build_ap_probe_req(wl, wl->probereq);
+                wl1271_cmd_build_ap_probe_req(wl, wlvif->probereq);
         }
 
         /* return to ROC if needed */
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 539cf40be535..8d100561522c 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -507,9 +507,6 @@ struct wl1271 {
 
         bool sched_scanning;
 
-        /* probe-req template for the current AP */
-        struct sk_buff *probereq;
-
         /* Our association ID */
         u16 aid;
 
@@ -641,6 +638,9 @@ struct wl12xx_vif {
          */
         u32 basic_rate;
         u32 rate_set;
+
+        /* probe-req template for the current AP */
+        struct sk_buff *probereq;
 };
 
 static inline struct wl12xx_vif *wl12xx_vif_to_data(struct ieee80211_vif *vif)