---

yaml --- r: 215037 b: refs/heads/master c: 4f35c02 h: refs/heads/master i: 215035: e07486d v: v3
git-mirror · Sep 28, 2010 · eaf6a3c · eaf6a3c
1 parent fc418d2
commit eaf6a3c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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,