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

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

[PATCH] libertas: remove adapter->scanmode 



scanmode was initialized with CMD_BSS_TYPE_ANY, but there is no code
that ever can store another value there, so it can go away.

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

drivers/net/wireless/libertas/dev.h

+0 −1
Original line number Diff line number Diff line
@@ -263,7 +263,6 @@ struct _wlan_adapter { 
	struct bss_descriptor *networks;



	u8 scantype;

	u32 scanmode;



	u8 adhoccreate;

drivers/net/wireless/libertas/main.c

+0 −3
Original line number Diff line number Diff line
@@ -1004,9 +1004,6 @@ static void wlan_init_adapter(wlan_private * priv) 
	/* scan type */

	adapter->scantype = CMD_SCAN_TYPE_ACTIVE;



	/* scan mode */

	adapter->scanmode = CMD_BSS_TYPE_ANY;



	/* 802.11 specific */

	adapter->secinfo.wep_enabled = 0;

	for (i = 0; i < sizeof(adapter->wep_keys) / sizeof(adapter->wep_keys[0]);

drivers/net/wireless/libertas/scan.c

+2 −4
Original line number Diff line number Diff line
@@ -361,7 +361,6 @@ wlan_scan_setup_scan_config(wlan_private * priv, 
			    u8 * pfilteredscan,

			    u8 * pscancurrentonly)

{

	wlan_adapter *adapter = priv->adapter;

	struct mrvlietypes_numprobes *pnumprobestlv;

	struct mrvlietypes_ssidparamset *pssidtlv;

	struct wlan_scan_cmd_config * pscancfgout = NULL;
@@ -412,8 +411,7 @@ wlan_scan_setup_scan_config(wlan_private * priv, 


		/* Set the bss type scan filter, use adapter setting if unset */

		pscancfgout->bsstype =

		    (puserscanin->bsstype ? puserscanin->bsstype : adapter->

		     scanmode);

		    puserscanin->bsstype ? puserscanin->bsstype : CMD_BSS_TYPE_ANY;



		/* Set the number of probes to send, use adapter setting if unset */

		numprobes = puserscanin->numprobes ? puserscanin->numprobes : 0;
@@ -448,7 +446,7 @@ wlan_scan_setup_scan_config(wlan_private * priv, 
			*pfilteredscan = 1;

		}

	} else {

		pscancfgout->bsstype = adapter->scanmode;

		pscancfgout->bsstype = CMD_BSS_TYPE_ANY;

		numprobes = 0;

	}