Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e22a855 authored by Holger Schurig's avatar Holger Schurig Committed by David S. Miller
Browse files

[PATCH] libertas: remove adapter->prescan 



The value 1 was assigned to it and there was nowhere any code
that would have changed that to 0.

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fdde7084

drivers/net/wireless/libertas/assoc.c

+2 −4
Original line number Diff line number Diff line
@@ -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);

		}



		bss = libertas_find_ssid_in_list(adapter, assoc_req->ssid,

				assoc_req->ssid_len, NULL, IW_MODE_INFRA, channel);

drivers/net/wireless/libertas/dev.h

+0 −1
Original line number Diff line number Diff line
@@ -288,7 +288,6 @@ struct _wlan_adapter { 
	u32 rtsthsd;



	u16 listeninterval;

	u16 prescan;

	u8 txretrycount;



	/** Tx-related variables (for single packet tx) */

drivers/net/wireless/libertas/main.c

+0 −2
Original line number Diff line number Diff line
@@ -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;