1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c
index 28ec0addc657..56f76abc754d 100644
--- a/drivers/net/wireless/wl12xx/scan.c
+++ b/drivers/net/wireless/wl12xx/scan.c
@@ -331,12 +331,16 @@ wl1271_scan_get_sched_scan_channels(struct wl1271 *wl,
         struct conf_sched_scan_settings *c = &wl->conf.sched_scan;
         int i, j;
         u32 flags;
+        bool force_passive = !req->n_ssids;
 
         for (i = 0, j = start;
              i < req->n_channels && j < MAX_CHANNELS_ALL_BANDS;
              i++) {
                 flags = req->channels[i]->flags;
 
+                if (force_passive)
+                        flags |= IEEE80211_CHAN_PASSIVE_SCAN;
+
                 if ((req->channels[i]->band == band) &&
                     !(flags & IEEE80211_CHAN_DISABLED) &&
                     (!!(flags & IEEE80211_CHAN_RADAR) == radar) &&
@@ -433,6 +437,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,
         struct wl1271_cmd_sched_scan_config *cfg = NULL;
         struct conf_sched_scan_settings *c = &wl->conf.sched_scan;
         int i, total_channels, ret;
+        bool force_passive = !req->n_ssids;
 
         wl1271_debug(DEBUG_CMD, "cmd sched_scan scan config");
 
@@ -456,7 +461,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,
         for (i = 0; i < SCAN_MAX_CYCLE_INTERVALS; i++)
                 cfg->intervals[i] = cpu_to_le32(req->interval);
 
-        if (req->ssids[0].ssid_len && req->ssids[0].ssid) {
+        if (!force_passive && req->ssids[0].ssid_len && req->ssids[0].ssid) {
                 cfg->filter_type = SCAN_SSID_FILTER_SPECIFIC;
                 cfg->ssid_len = req->ssids[0].ssid_len;
                 memcpy(cfg->ssid, req->ssids[0].ssid,
@@ -473,7 +478,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,
                 goto out;
         }
 
-        if (cfg->active[0]) {
+        if (!force_passive && cfg->active[0]) {
                 ret = wl1271_cmd_build_probe_req(wl, req->ssids[0].ssid,
                                                  req->ssids[0].ssid_len,
                                                  ies->ie[IEEE80211_BAND_2GHZ],
@@ -485,7 +490,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,
                 }
         }
 
-        if (cfg->active[1]) {
+        if (!force_passive && cfg->active[1]) {
                 ret = wl1271_cmd_build_probe_req(wl,  req->ssids[0].ssid,
                                                  req->ssids[0].ssid_len,
                                                  ies->ie[IEEE80211_BAND_5GHZ],