---

yaml --- r: 66469 b: refs/heads/master c: 6e22a85 h: refs/heads/master i: 66467: 1b50648 v: v3
git-mirror · Oct 10, 2007 · 6eca6cf · 6eca6cf
1 parent dba8ce5
commit 6eca6cf
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fdde7084e033263f48d26d5b24ecf626aed29b5b
+refs/heads/master: 6e22a855b27ddc0725c134cc428ee668e56ac9f8
diff --git a/trunk/drivers/net/wireless/libertas/assoc.c b/trunk/drivers/net/wireless/libertas/assoc.c
@@ -57,10 +57,8 @@ static int assoc_helper_essid(wlan_private *priv,
 	lbs_deb_assoc("New SSID requested: '%s'\n",
 	              escape_essid(assoc_req->ssid, assoc_req->ssid_len));
 	if (assoc_req->mode == IW_MODE_INFRA) {
-		if (adapter->prescan) {
-			libertas_send_specific_ssid_scan(priv, assoc_req->ssid,
-				assoc_req->ssid_len, 0);
-		}
+		libertas_send_specific_ssid_scan(priv, assoc_req->ssid,
+			assoc_req->ssid_len, 0);
 
 		bss = libertas_find_ssid_in_list(adapter, assoc_req->ssid,
 				assoc_req->ssid_len, NULL, IW_MODE_INFRA, channel);

diff --git a/trunk/drivers/net/wireless/libertas/dev.h b/trunk/drivers/net/wireless/libertas/dev.h
@@ -288,7 +288,6 @@ struct _wlan_adapter {
 	u32 rtsthsd;
 
 	u16 listeninterval;
-	u16 prescan;
 	u8 txretrycount;
 
 	/** Tx-related variables (for single packet tx) */

diff --git a/trunk/drivers/net/wireless/libertas/main.c b/trunk/drivers/net/wireless/libertas/main.c
@@ -1037,8 +1037,6 @@ static void wlan_init_adapter(wlan_private * priv)
 
 	mutex_init(&adapter->lock);
 
-	adapter->prescan = 1;
-
 	memset(&adapter->curbssparams, 0, sizeof(adapter->curbssparams));
 	adapter->curbssparams.channel = DEFAULT_AD_HOC_CHANNEL;