From eaf6a3c9a7609a6ec5c31d54d08aa856232b8673 Mon Sep 17 00:00:00 2001 From: Luciano Coelho Date: Wed, 4 Aug 2010 04:36:32 +0300 Subject: [PATCH] --- yaml --- r: 215037 b: refs/heads/master c: 4f35c0253ab7f32cf30eab5459e8256af1619ff1 h: refs/heads/master i: 215035: e07486d3c9b155971fa1450a0691c838bac0af50 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/wl1271_scan.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8d1c89c3b5bc..ff529055914a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5924f89d6597cd7ba014128ded64b2c7450c369c +refs/heads/master: 4f35c0253ab7f32cf30eab5459e8256af1619ff1 diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_scan.c b/trunk/drivers/net/wireless/wl12xx/wl1271_scan.c index 8ceaabe26e64..7f42ca9abab8 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1271_scan.c +++ b/trunk/drivers/net/wireless/wl12xx/wl1271_scan.c @@ -100,8 +100,11 @@ static int wl1271_scan_send(struct wl1271 *wl, enum ieee80211_band band, /* We always use high priority scans */ scan_options = WL1271_SCAN_OPT_PRIORITY_HIGH; - if(passive) + + /* No SSIDs means that we have a forced passive scan */ + if (passive || wl->scan.req->n_ssids == 0) scan_options |= WL1271_SCAN_OPT_PASSIVE; + cmd->params.scan_options = cpu_to_le16(scan_options); cmd->params.n_ch = wl1271_get_scan_channels(wl, wl->scan.req,