skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-02-08 07:42:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove typedef statements from include/ieee80211.h

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-03-18 13:12:26 -05:00
parent 7460f4b22a
commit 7162635d09
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/rtw_ieee80211.c
View file

@ -1094,7 +1094,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
* @show_errors: Whether to show parsing errors in debug log * @show_errors: Whether to show parsing errors in debug log
* Returns: Parsing result * Returns: Parsing result
*/ */
ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len, enum ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len,
struct rtw_ieee802_11_elems *elems, struct rtw_ieee802_11_elems *elems,
int show_errors) int show_errors)
{ {

35
include/ieee80211.h
View file

@ -150,20 +150,19 @@ extern u8 RSN_CIPHER_SUITE_WRAP[];
extern u8 RSN_CIPHER_SUITE_CCMP[]; extern u8 RSN_CIPHER_SUITE_CCMP[];
extern u8 RSN_CIPHER_SUITE_WEP104[]; extern u8 RSN_CIPHER_SUITE_WEP104[];
typedef enum _RATR_TABLE_MODE{ enum RATR_TABLE_MODE {
RATR_INX_WIRELESS_NGB = 0, /* BGN 40 Mhz 2SS 1SS */ RATR_INX_WIRELESS_NGB = 0, /* BGN 40 Mhz 2SS 1SS */
RATR_INX_WIRELESS_NG = 1, /* GN or N */ RATR_INX_WIRELESS_NG = 1, /* GN or N */
RATR_INX_WIRELESS_NB = 2, /* BGN 20 Mhz 2SS 1SS or BN */ RATR_INX_WIRELESS_NB = 2, /* BGN 20 Mhz 2SS 1SS or BN */
RATR_INX_WIRELESS_N = 3, RATR_INX_WIRELESS_N = 3,
RATR_INX_WIRELESS_GB = 4, RATR_INX_WIRELESS_GB = 4,
RATR_INX_WIRELESS_G = 5, RATR_INX_WIRELESS_G = 5,
RATR_INX_WIRELESS_B = 6, RATR_INX_WIRELESS_B = 6,
RATR_INX_WIRELESS_MC = 7, RATR_INX_WIRELESS_MC = 7,
RATR_INX_WIRELESS_AC_N = 8, RATR_INX_WIRELESS_AC_N = 8,
}RATR_TABLE_MODE, *PRATR_TABLE_MODE; };
enum NETWORK_TYPE enum NETWORK_TYPE {
{
WIRELESS_INVALID = 0, WIRELESS_INVALID = 0,
/* Sub-Element */ /* Sub-Element */
WIRELESS_11B = BIT(0), /* tx: cck only , rx: cck only, hw: cck */ WIRELESS_11B = BIT(0), /* tx: cck only , rx: cck only, hw: cck */
@ -201,7 +200,7 @@ enum NETWORK_TYPE
#define IsSupportedTxMCS(NetType) ((NetType) & (WIRELESS_11_24N|WIRELESS_11_5N) ? true : false) #define IsSupportedTxMCS(NetType) ((NetType) & (WIRELESS_11_24N|WIRELESS_11_5N) ? true : false)
typedef struct ieee_param { struct ieee_param {
u32 cmd; u32 cmd;
u8 sta_addr[ETH_ALEN]; u8 sta_addr[ETH_ALEN];
union { union {
@ -242,16 +241,16 @@ typedef struct ieee_param {
#endif #endif
} u; } u;
}ieee_param; };
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
typedef struct ieee_param_ex { struct ieee_param_ex {
u32 cmd; u32 cmd;
u8 sta_addr[ETH_ALEN]; u8 sta_addr[ETH_ALEN];
u8 data[0]; u8 data[0];
}ieee_param_ex; };
struct sta_data{ struct sta_data {
u16 aid; u16 aid;
u16 capability; u16 capability;
int flags; int flags;
@ -978,12 +977,10 @@ extern __inline int is_zero_mac_addr(const u8 *addr)
#define CFG_IEEE80211_RESERVE_FCS (1<<0) #define CFG_IEEE80211_RESERVE_FCS (1<<0)
#define CFG_IEEE80211_COMPUTE_FCS (1<<1) #define CFG_IEEE80211_COMPUTE_FCS (1<<1)
typedef struct tx_pending_t{ struct tx_pending_t {
int frag; int frag;
struct ieee80211_txb *txb; struct ieee80211_txb *txb;
}tx_pending_t; };
#define MAXTID 16 #define MAXTID 16
@ -1215,9 +1212,13 @@ struct rtw_ieee802_11_elems {
u8 vendor_ht_cap_len; u8 vendor_ht_cap_len;
}; };
typedef enum { ParseOK = 0, ParseUnknown = 1, ParseFailed = -1 } ParseRes; enum ParseRes {
ParseOK = 0,
ParseUnknown = 1,
ParseFailed = -1
};
ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len, enum ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len,
struct rtw_ieee802_11_elems *elems, struct rtw_ieee802_11_elems *elems,
int show_errors); int show_errors);