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

Commit f0799895 authored by Hante Meuleman's avatar Hante Meuleman Committed by John W. Linville
Browse files

brcmfmac: remove obsolete i-scan and clean up related code. 



e-scan has become the default scanning method. This patch removes
the i-scan related code and cleans up e-scan related code to be
always enabled.

Reviewed-by: default avatarArend Van Spriel <arend@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3082b9be

drivers/net/wireless/brcm80211/Kconfig

+0 −8
Original line number Original line Diff line number Diff line
@@ -55,14 +55,6 @@ config BRCMFMAC_USB 
	  IEEE802.11n embedded FullMAC WLAN driver. Say Y if you want to

	  IEEE802.11n embedded FullMAC WLAN driver. Say Y if you want to

	  use the driver for an USB wireless card.

	  use the driver for an USB wireless card.





config BRCMISCAN

	bool "Broadcom I-Scan (OBSOLETE)"

	depends on BRCMFMAC

	---help---

	  This option enables the I-Scan method. By default fullmac uses the

	  new E-Scan method which uses less memory in firmware and gives no

	  limitation on the number of scan results.



config BRCMDBG

config BRCMDBG

	bool "Broadcom driver debug functions"

	bool "Broadcom driver debug functions"

	depends on BRCMSMAC || BRCMFMAC

	depends on BRCMSMAC || BRCMFMAC

drivers/net/wireless/brcm80211/brcmfmac/dhd.h

+0 −44
Original line number Original line Diff line number Diff line
@@ -100,19 +100,6 @@ 
#define BRCMF_SCAN_PARAMS_COUNT_MASK 0x0000ffff

#define BRCMF_SCAN_PARAMS_COUNT_MASK 0x0000ffff

#define BRCMF_SCAN_PARAMS_NSSID_SHIFT 16

#define BRCMF_SCAN_PARAMS_NSSID_SHIFT 16





#define BRCMF_SCAN_ACTION_START      1

#define BRCMF_SCAN_ACTION_CONTINUE   2

#define WL_SCAN_ACTION_ABORT      3



#define BRCMF_ISCAN_REQ_VERSION 1



/* brcmf_iscan_results status values */

#define BRCMF_SCAN_RESULTS_SUCCESS	0

#define BRCMF_SCAN_RESULTS_PARTIAL	1

#define BRCMF_SCAN_RESULTS_PENDING	2

#define BRCMF_SCAN_RESULTS_ABORTED	3

#define BRCMF_SCAN_RESULTS_NO_MEM	4



/* Indicates this key is using soft encrypt */

/* Indicates this key is using soft encrypt */

#define WL_SOFT_KEY	(1 << 0)

#define WL_SOFT_KEY	(1 << 0)

/* primary (ie tx) key */

/* primary (ie tx) key */
@@ -452,14 +439,6 @@ struct brcmf_scan_params_le { 
	__le16 channel_list[1];	/* list of chanspecs */

	__le16 channel_list[1];	/* list of chanspecs */

};

};





/* incremental scan struct */

struct brcmf_iscan_params_le {

	__le32 version;

	__le16 action;

	__le16 scan_duration;

	struct brcmf_scan_params_le params_le;

};



struct brcmf_scan_results {

struct brcmf_scan_results {

	u32 buflen;

	u32 buflen;

	u32 version;

	u32 version;
@@ -467,12 +446,6 @@ struct brcmf_scan_results { 
	struct brcmf_bss_info_le bss_info_le[];

	struct brcmf_bss_info_le bss_info_le[];

};

};





struct brcmf_scan_results_le {

	__le32 buflen;

	__le32 version;

	__le32 count;

};



struct brcmf_escan_params_le {

struct brcmf_escan_params_le {

	__le32 version;

	__le32 version;

	__le16 action;

	__le16 action;
@@ -508,23 +481,6 @@ struct brcmf_join_params { 
	struct brcmf_assoc_params_le params_le;

	struct brcmf_assoc_params_le params_le;

};

};





/* incremental scan results struct */

struct brcmf_iscan_results {

	union {

		u32 status;

		__le32 status_le;

	};

	union {

		struct brcmf_scan_results results;

		struct brcmf_scan_results_le results_le;

	};

};



/* size of brcmf_iscan_results not including variable length array */

#define BRCMF_ISCAN_RESULTS_FIXED_SIZE \

	(sizeof(struct brcmf_scan_results) + \

	 offsetof(struct brcmf_iscan_results, results))



struct brcmf_wsec_key {

struct brcmf_wsec_key {

	u32 index;		/* key index */

	u32 index;		/* key index */

	u32 len;		/* key length */

	u32 len;		/* key length */

drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h

+4 −5
Original line number Original line Diff line number Diff line
@@ -27,11 +27,10 @@ 
#define BRCMF_HDRS_VAL	0x0040

#define BRCMF_HDRS_VAL	0x0040

#define BRCMF_BYTES_VAL	0x0080

#define BRCMF_BYTES_VAL	0x0080

#define BRCMF_INTR_VAL	0x0100

#define BRCMF_INTR_VAL	0x0100

#define BRCMF_GLOM_VAL	0x0400

#define BRCMF_GLOM_VAL	0x0200

#define BRCMF_EVENT_VAL	0x0800

#define BRCMF_EVENT_VAL	0x0400

#define BRCMF_BTA_VAL	0x1000

#define BRCMF_BTA_VAL	0x0800

#define BRCMF_ISCAN_VAL 0x2000

#define BRCMF_FIL_VAL	0x1000

#define BRCMF_FIL_VAL	0x4000





#if defined(DEBUG)

#if defined(DEBUG)

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+18 −563

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h

+5 −63

File changed.

Preview size limit exceeded, changes collapsed.