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

Commit eb816036 authored by Brett Rudley's avatar Brett Rudley Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: Separate fullmac vs softmac defs in shared file 



wlioctl.h is shared by fullmac and softmac but mostly fullmac. Separate out
fullmac to purge extranous code in softmac and possibly as a step towards it own file.

Signed-off-by: default avatarBrett Rudley <brudley@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7f7c3dbb

drivers/staging/brcm80211/include/wlioctl.h

+12 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#define BWL_DEFAULT_PACKING

#include <packed_section_start.h>



#ifdef BRCM_FULLMAC

/* Legacy structure to help keep backward compatible wl tool and tray app */



#define	LEGACY_WL_BSS_INFO_VERSION	107	/* older version of wl_bss_info struct */
@@ -148,12 +149,14 @@ typedef struct wl_bss_info { 
	/* Add new fields here */

	/* variable length Information Elements */

} wl_bss_info_t;

#endif /* BRCM_FULLMAC */



typedef struct wlc_ssid {

	u32 SSID_len;

	unsigned char SSID[32];

} wlc_ssid_t;



#ifdef BRCM_FULLMAC

typedef struct chan_scandata {

	u8 txpower;

	u8 pad;
@@ -308,6 +311,7 @@ typedef struct wl_probe_params { 
	struct ether_addr bssid;

	struct ether_addr mac;

} wl_probe_params_t;

#endif /* BRCM_FULLMAC */



#define WL_NUMRATES		16	/* max # of rates in a rateset */

typedef struct wl_rateset {
@@ -315,6 +319,7 @@ typedef struct wl_rateset { 
	u8 rates[WL_NUMRATES];	/* rates in 500kbps units w/hi bit set if basic */

} wl_rateset_t;



#ifdef BRCM_FULLMAC

typedef struct wl_rateset_args {

	u32 count;		/* # rates in this set */

	u8 rates[WL_NUMRATES];	/* rates in 500kbps units w/hi bit set if basic */
@@ -352,6 +357,8 @@ typedef struct wl_join_params { 
} wl_join_params_t;

#define WL_JOIN_PARAMS_FIXED_SIZE 	(sizeof(wl_join_params_t) - sizeof(chanspec_t))



#endif /* BRCM_FULLMAC */



/* defines used by the nrate iovar */

#define NRATE_MCS_INUSE	0x00000080	/* MSC in use,indicates b0-6 holds an mcs */

#define NRATE_RATE_MASK 0x0000007f	/* rate/mcs value */
@@ -391,6 +398,7 @@ typedef struct { 


#define HIGHEST_SINGLE_STREAM_MCS	7	/* MCS values greater than this enable multiple streams */



#ifdef BRCM_FULLMAC

#define MAX_CCA_CHANNELS 38	/* Max number of 20 Mhz wide channels */

#define MAX_CCA_SECS     60	/* CCA keeps this many seconds history */
@@ -428,8 +436,11 @@ typedef struct { 
	cca_congest_t secs[1];	/* Data */

} cca_congest_channel_req_t;



#endif /* BRCM_FULLMAC */



#define WLC_CNTRY_BUF_SZ	4	/* Country string is 3 bytes + NUL */



#ifdef BRCM_FULLMAC

typedef struct wl_country {

	char country_abbrev[WLC_CNTRY_BUF_SZ];	/* nul-terminated country code used in

						 * the Country IE
@@ -516,6 +527,7 @@ typedef struct wl_rm_rep { 
	wl_rm_rep_elt_t rep[1];	/* variable length block of reports */

} wl_rm_rep_t;

#define WL_RM_REP_FIXED_LEN	8

#endif /* BRCM_FULLMAC */



/* Enumerate crypto algorithms */

#define	CRYPTO_ALGO_OFF			0

drivers/staging/brcm80211/sys/wlc_mac80211.c

+2 −0
Original line number Diff line number Diff line
@@ -1781,8 +1781,10 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode, 
	ASSERT(sizeof(struct dot11_bcn_prb) == DOT11_BCN_PRB_LEN);

	ASSERT(sizeof(tx_status_t) == TXSTATUS_LEN);

	ASSERT(sizeof(ht_cap_ie_t) == HT_CAP_IE_LEN);

#ifdef BRCM_FULLMAC

	ASSERT(offsetof(wl_scan_params_t, channel_list) ==

	       WL_SCAN_PARAMS_FIXED_SIZE);

#endif

	ASSERT(IS_ALIGNED(offsetof(wsec_key_t, data), sizeof(u32)));

	ASSERT(ISPOWEROF2(MA_WINDOW_SZ));