aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/libertas')
-rw-r--r--drivers/net/wireless/libertas/assoc.c6
-rw-r--r--drivers/net/wireless/libertas/dev.h1
-rw-r--r--drivers/net/wireless/libertas/main.c2
3 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index 5fdc96f289b8..ffeec2fa60ae 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -57,10 +57,8 @@ static int assoc_helper_essid(wlan_private *priv,
57 lbs_deb_assoc("New SSID requested: '%s'\n", 57 lbs_deb_assoc("New SSID requested: '%s'\n",
58 escape_essid(assoc_req->ssid, assoc_req->ssid_len)); 58 escape_essid(assoc_req->ssid, assoc_req->ssid_len));
59 if (assoc_req->mode == IW_MODE_INFRA) { 59 if (assoc_req->mode == IW_MODE_INFRA) {
60 if (adapter->prescan) { 60 libertas_send_specific_ssid_scan(priv, assoc_req->ssid,
61 libertas_send_specific_ssid_scan(priv, assoc_req->ssid, 61 assoc_req->ssid_len, 0);
62 assoc_req->ssid_len, 0);
63 }
64 62
65 bss = libertas_find_ssid_in_list(adapter, assoc_req->ssid, 63 bss = libertas_find_ssid_in_list(adapter, assoc_req->ssid,
66 assoc_req->ssid_len, NULL, IW_MODE_INFRA, channel); 64 assoc_req->ssid_len, NULL, IW_MODE_INFRA, channel);
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 765c0c4f641a..83876a3c41ce 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -288,7 +288,6 @@ struct _wlan_adapter {
288 u32 rtsthsd; 288 u32 rtsthsd;
289 289
290 u16 listeninterval; 290 u16 listeninterval;
291 u16 prescan;
292 u8 txretrycount; 291 u8 txretrycount;
293 292
294 /** Tx-related variables (for single packet tx) */ 293 /** Tx-related variables (for single packet tx) */
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 5b4a1343559b..e354ebbca4b0 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -1037,8 +1037,6 @@ static void wlan_init_adapter(wlan_private * priv)
1037 1037
1038 mutex_init(&adapter->lock); 1038 mutex_init(&adapter->lock);
1039 1039
1040 adapter->prescan = 1;
1041
1042 memset(&adapter->curbssparams, 0, sizeof(adapter->curbssparams)); 1040 memset(&adapter->curbssparams, 0, sizeof(adapter->curbssparams));
1043 adapter->curbssparams.channel = DEFAULT_AD_HOC_CHANNEL; 1041 adapter->curbssparams.channel = DEFAULT_AD_HOC_CHANNEL;
1044 1042