---

yaml --- r: 66470 b: refs/heads/master c: e2aa334 h: refs/heads/master v: v3
git-mirror · Oct 10, 2007 · 51551d4 · 51551d4
1 parent 6eca6cf
commit 51551d4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e22a855b27ddc0725c134cc428ee668e56ac9f8
+refs/heads/master: e2aa334bee4ae9fe27f26b0732c0443d2f11a8af
diff --git a/trunk/drivers/net/wireless/libertas/dev.h b/trunk/drivers/net/wireless/libertas/dev.h
@@ -375,7 +375,6 @@ struct _wlan_adapter {
 	struct wlan_offset_value offsetvalue;
 
 	struct cmd_ds_802_11_get_log logmsg;
-	u16 scanprobes;
 
 	u32 pkttxctrl;
 

diff --git a/trunk/drivers/net/wireless/libertas/main.c b/trunk/drivers/net/wireless/libertas/main.c
@@ -998,8 +998,6 @@ static void wlan_init_adapter(wlan_private * priv)
 	wlan_adapter *adapter = priv->adapter;
 	int i;
 
-	adapter->scanprobes = 0;
-
 	adapter->bcn_avg_factor = DEFAULT_BCN_AVG_FACTOR;
 	adapter->data_avg_factor = DEFAULT_DATA_AVG_FACTOR;
 

diff --git a/trunk/drivers/net/wireless/libertas/scan.c b/trunk/drivers/net/wireless/libertas/scan.c
@@ -416,8 +416,7 @@ wlan_scan_setup_scan_config(wlan_private * priv,
 		     scanmode);
 
 		/* Set the number of probes to send, use adapter setting if unset */
-		numprobes = (puserscanin->numprobes ? puserscanin->numprobes :
-			     adapter->scanprobes);
+		numprobes = puserscanin->numprobes ? puserscanin->numprobes : 0;
 
 		/*
 		 * Set the BSSID filter to the incoming configuration,
@@ -450,7 +449,7 @@ wlan_scan_setup_scan_config(wlan_private * priv,
 		}
 	} else {
 		pscancfgout->bsstype = adapter->scanmode;
-		numprobes = adapter->scanprobes;
+		numprobes = 0;
 	}
 
 	/* If the input config or adapter has the number of Probes set, add tlv */