Commit 9152bf26 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: emptied include/802.11.h 



Code cleanup. Removed unused definitions. Moved other definitions to less
generic locations.

Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 78539a21

drivers/staging/brcm80211/brcmfmac/dhd.h

+3 −0
Original line number Diff line number Diff line
@@ -188,6 +188,9 @@ struct dhd_info; 
#define DHD_DEL_IF	-0xe

#define DHD_BAD_IF	-0xf



#define DOT11_BSSTYPE_ANY			2

#define DOT11_MAX_DEFAULT_KEYS	4



enum cust_gpio_modes {

	WLAN_RESET_ON,

	WLAN_RESET_OFF,

drivers/staging/brcm80211/brcmfmac/dhd_common.c

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ 
#include <dhd_dbg.h>

#include <msgtrace.h>



#define BRCM_OUI		"\x00\x10\x18"

#define DOT11_OUI_LEN			3



int dhd_msg_level;

char fw_path[MOD_PARAM_PATHLEN];

char nv_path[MOD_PARAM_PATHLEN];

drivers/staging/brcm80211/brcmfmac/wl_iw.c

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ typedef const struct si_pub si_t; 
#include <dngl_stats.h>

#include <dhd.h>



#define WPA_OUI			"\x00\x50\xF2"

#define DOT11_MNG_RSN_ID			48

#define DOT11_MNG_WPA_ID			221



#define WL_ERROR(fmt, args...)	printk(fmt, ##args)

#define WL_TRACE(fmt, args...)	no_printk(fmt, ##args)

#define WL_INFORM(fmt, args...)	no_printk(fmt, ##args)

drivers/staging/brcm80211/brcmsmac/wlc_bmac.c

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ 
		(void *)&(wlc_hw->regs->fifo64regs[fifonum].dmaxmt) : \

		(void *)&(wlc_hw->regs->fifo64regs[fifonum].dmarcv))



#define APHY_SLOT_TIME		9

#define BPHY_SLOT_TIME		20



/*

 * The following table lists the buffer memory allocated to xmt fifos in HW.

 * the size is in units of 256bytes(one block), total size is HW dependent

drivers/staging/brcm80211/brcmsmac/wlc_main.c

+64 −0
Original line number Diff line number Diff line
@@ -114,6 +114,70 @@ 
#define WLFEATURE_DISABLE_11N_AMPDU_RX	0x00000040

#define WLFEATURE_DISABLE_11N_GF	0x00000080



#define EDCF_ACI_MASK                0x60

#define EDCF_ACI_SHIFT               5

#define EDCF_ECWMIN_MASK             0x0f

#define EDCF_ECWMAX_SHIFT            4

#define EDCF_AIFSN_MASK              0x0f

#define EDCF_AIFSN_MAX               15

#define EDCF_ECWMAX_MASK             0xf0



#define EDCF_AC_BE_TXOP_STA          0x0000

#define EDCF_AC_BK_TXOP_STA          0x0000

#define EDCF_AC_VO_ACI_STA           0x62

#define EDCF_AC_VO_ECW_STA           0x32

#define EDCF_AC_VI_ACI_STA           0x42

#define EDCF_AC_VI_ECW_STA           0x43

#define EDCF_AC_BK_ECW_STA           0xA4

#define EDCF_AC_VI_TXOP_STA          0x005e

#define EDCF_AC_VO_TXOP_STA          0x002f

#define EDCF_AC_BE_ACI_STA           0x03

#define EDCF_AC_BE_ECW_STA           0xA4

#define EDCF_AC_BK_ACI_STA           0x27

#define EDCF_AC_VO_TXOP_AP           0x002f



#define EDCF_TXOP2USEC(txop)         ((txop) << 5)

#define EDCF_ECW2CW(exp)             ((1 << (exp)) - 1)



#define APHY_SYMBOL_TIME	4

#define APHY_PREAMBLE_TIME	16

#define APHY_SIGNAL_TIME	4

#define APHY_SIFS_TIME		16

#define APHY_SERVICE_NBITS	16

#define APHY_TAIL_NBITS		6

#define BPHY_SIFS_TIME		10

#define BPHY_PLCP_SHORT_TIME	96



#define PREN_PREAMBLE		24

#define PREN_MM_EXT		12

#define PREN_PREAMBLE_EXT	4



#define DOT11_MAC_HDR_LEN		24

#define	DOT11_ACK_LEN		10

#define DOT11_BA_LEN		4

#define DOT11_OFDM_SIGNAL_EXTENSION	6

#define DOT11_MIN_FRAG_LEN		256

#define	DOT11_RTS_LEN		16

#define	DOT11_CTS_LEN		10

#define DOT11_BA_BITMAP_LEN		128

#define DOT11_MIN_BEACON_PERIOD		1

#define DOT11_MAX_BEACON_PERIOD		0xFFFF

#define	DOT11_MAXNUMFRAGS	16

#define DOT11_MAX_FRAG_LEN		2346



#define BPHY_PLCP_TIME		192

#define RIFS_11N_TIME		2



#define WME_VER			1

#define WME_SUBTYPE_PARAM_IE	1

#define WME_TYPE		2

#define WME_OUI			"\x00\x50\xf2"



#define AC_BE			0

#define AC_BK			1

#define AC_VI			2

#define AC_VO			3



/*

 * driver maintains internal 'tick'(wlc->pub->now) which increments in 1s OS timer(soft

 * watchdog) it is not a wall clock and won't increment when driver is in "down" state