---

yaml --- r: 66485 b: refs/heads/master c: 4f2fdaa h: refs/heads/master i: 66483: 47be7da v: v3
git-mirror · Oct 10, 2007 · 9836d30 · 9836d30
1 parent 20e37ac
commit 9836d30
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d65ead886a193682f88b07aaf11d46127735a2b5
+refs/heads/master: 4f2fdaaf0e4209bff3b18dc14c915b61f5fa5cd2
diff --git a/trunk/drivers/net/wireless/libertas/dev.h b/trunk/drivers/net/wireless/libertas/dev.h
@@ -262,8 +262,6 @@ struct _wlan_adapter {
 	struct list_head network_free_list;
 	struct bss_descriptor *networks;
 
-	u8 scantype;
-
 	u8 adhoccreate;
 
 	/** capability Info used in Association, start, join */

diff --git a/trunk/drivers/net/wireless/libertas/main.c b/trunk/drivers/net/wireless/libertas/main.c
@@ -1001,9 +1001,6 @@ static void wlan_init_adapter(wlan_private * priv)
 	adapter->connect_status = LIBERTAS_DISCONNECTED;
 	memset(adapter->current_addr, 0xff, ETH_ALEN);
 
-	/* scan type */
-	adapter->scantype = CMD_SCAN_TYPE_ACTIVE;
-
 	/* 802.11 specific */
 	adapter->secinfo.wep_enabled = 0;
 	for (i = 0; i < sizeof(adapter->wep_keys) / sizeof(adapter->wep_keys[0]);

diff --git a/trunk/drivers/net/wireless/libertas/scan.c b/trunk/drivers/net/wireless/libertas/scan.c
@@ -252,7 +252,7 @@ static void wlan_scan_create_channel_list(wlan_private * priv,
 	 *   be changed to passive on a per channel basis if restricted by
 	 *   regulatory requirements (11d or 11h)
 	 */
-	scantype = adapter->scantype;
+	scantype = CMD_SCAN_TYPE_ACTIVE;
 
 	for (rgnidx = 0; rgnidx < ARRAY_SIZE(adapter->region_channel); rgnidx++) {
 		if (priv->adapter->enable11d &&