Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

3 files changed, 24 insertions, 7 deletions

diff --git a/drivers/net/wireless/ti/wl1251/event.c b/drivers/net/wireless/ti/wl1251/event.c
index 5ec50a476a69..74ae8e1c2e33 100644
--- a/drivers/net/wireless/ti/wl1251/event.c
+++ b/drivers/net/wireless/ti/wl1251/event.c
@@ -29,6 +29,8 @@
 static int wl1251_event_scan_complete(struct wl1251 *wl,
                                       struct event_mailbox *mbox)
 {
+        int ret = 0;
+
         wl1251_debug(DEBUG_EVENT, "status: 0x%x, channels: %d",
                      mbox->scheduled_scan_status,
                      mbox->scheduled_scan_channels);
@@ -37,9 +39,11 @@ static int wl1251_event_scan_complete(struct wl1251 *wl,
                 ieee80211_scan_completed(wl->hw, false);
                 wl1251_debug(DEBUG_MAC80211, "mac80211 hw scan completed");
                 wl->scanning = false;
+                if (wl->hw->conf.flags & IEEE80211_CONF_IDLE)
+                        ret = wl1251_ps_set_mode(wl, STATION_IDLE);
         }
 
-        return 0;
+        return ret;
 }
 
 static void wl1251_event_mbox_dump(struct event_mailbox *mbox)
diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c
index f47e8b0482ad..bbbf68cf50a7 100644
--- a/drivers/net/wireless/ti/wl1251/main.c
+++ b/drivers/net/wireless/ti/wl1251/main.c
@@ -623,7 +623,7 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed)
                 }
         }
 
-        if (changed & IEEE80211_CONF_CHANGE_IDLE) {
+        if (changed & IEEE80211_CONF_CHANGE_IDLE && !wl->scanning) {
                 if (conf->flags & IEEE80211_CONF_IDLE) {
                         ret = wl1251_ps_set_mode(wl, STATION_IDLE);
                         if (ret < 0)
@@ -895,11 +895,21 @@ static int wl1251_op_hw_scan(struct ieee80211_hw *hw,
         if (ret < 0)
                 goto out;
 
+        if (hw->conf.flags & IEEE80211_CONF_IDLE) {
+                ret = wl1251_ps_set_mode(wl, STATION_ACTIVE_MODE);
+                if (ret < 0)
+                        goto out_sleep;
+                ret = wl1251_join(wl, wl->bss_type, wl->channel,
+                                  wl->beacon_int, wl->dtim_period);
+                if (ret < 0)
+                        goto out_sleep;
+        }
+
         skb = ieee80211_probereq_get(wl->hw, wl->vif, ssid, ssid_len,
                                      req->ie_len);
         if (!skb) {
                 ret = -ENOMEM;
-                goto out;
+                goto out_idle;
         }
         if (req->ie_len)
                 memcpy(skb_put(skb, req->ie_len), req->ie, req->ie_len);
@@ -908,11 +918,11 @@ static int wl1251_op_hw_scan(struct ieee80211_hw *hw,
                                       skb->len);
         dev_kfree_skb(skb);
         if (ret < 0)
-                goto out_sleep;
+                goto out_idle;
 
         ret = wl1251_cmd_trigger_scan_to(wl, 0);
         if (ret < 0)
-                goto out_sleep;
+                goto out_idle;
 
         wl->scanning = true;
 
@@ -920,9 +930,13 @@ static int wl1251_op_hw_scan(struct ieee80211_hw *hw,
                               req->n_channels, WL1251_SCAN_NUM_PROBES);
         if (ret < 0) {
                 wl->scanning = false;
-                goto out_sleep;
+                goto out_idle;
         }
+        goto out_sleep;
 
+out_idle:
+        if (hw->conf.flags & IEEE80211_CONF_IDLE)
+                ret = wl1251_ps_set_mode(wl, STATION_IDLE);
 out_sleep:
         wl1251_ps_elp_sleep(wl);
 
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 28a37576d568..2c2ff3e1f849 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -5636,7 +5636,6 @@ static int wl1271_init_ieee80211(struct wl1271 *wl)
                 IEEE80211_HW_AP_LINK_PS |
                 IEEE80211_HW_AMPDU_AGGREGATION |
                 IEEE80211_HW_TX_AMPDU_SETUP_IN_HW |
-                IEEE80211_HW_SCAN_WHILE_IDLE |
                 IEEE80211_HW_QUEUE_CONTROL;
 
         wl->hw->wiphy->cipher_suites = cipher_suites;