Browse Source

[PATCH] libertas: remove adapter->scantype

scantype was initialized with CMD_SCAN_TYPE_ACTIVE, but there is no code
that would ever change it, so we can use that variable directly.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Holger Schurig 18 years ago
parent
commit
4f2fdaaf0e

+ 0 - 2
drivers/net/wireless/libertas/dev.h

@@ -262,8 +262,6 @@ struct _wlan_adapter {
 	struct list_head network_free_list;
 	struct list_head network_free_list;
 	struct bss_descriptor *networks;
 	struct bss_descriptor *networks;
 
 
-	u8 scantype;
-
 	u8 adhoccreate;
 	u8 adhoccreate;
 
 
 	/** capability Info used in Association, start, join */
 	/** capability Info used in Association, start, join */

+ 0 - 3
drivers/net/wireless/libertas/main.c

@@ -1001,9 +1001,6 @@ static void wlan_init_adapter(wlan_private * priv)
 	adapter->connect_status = LIBERTAS_DISCONNECTED;
 	adapter->connect_status = LIBERTAS_DISCONNECTED;
 	memset(adapter->current_addr, 0xff, ETH_ALEN);
 	memset(adapter->current_addr, 0xff, ETH_ALEN);
 
 
-	/* scan type */
-	adapter->scantype = CMD_SCAN_TYPE_ACTIVE;
-
 	/* 802.11 specific */
 	/* 802.11 specific */
 	adapter->secinfo.wep_enabled = 0;
 	adapter->secinfo.wep_enabled = 0;
 	for (i = 0; i < sizeof(adapter->wep_keys) / sizeof(adapter->wep_keys[0]);
 	for (i = 0; i < sizeof(adapter->wep_keys) / sizeof(adapter->wep_keys[0]);

+ 1 - 1
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
 	 *   be changed to passive on a per channel basis if restricted by
 	 *   regulatory requirements (11d or 11h)
 	 *   regulatory requirements (11d or 11h)
 	 */
 	 */
-	scantype = adapter->scantype;
+	scantype = CMD_SCAN_TYPE_ACTIVE;
 
 
 	for (rgnidx = 0; rgnidx < ARRAY_SIZE(adapter->region_channel); rgnidx++) {
 	for (rgnidx = 0; rgnidx < ARRAY_SIZE(adapter->region_channel); rgnidx++) {
 		if (priv->adapter->enable11d &&
 		if (priv->adapter->enable11d &&