rtl8188eu: Convert the typedef statements in include/wlan_bssdef.h

One remains that I still do not know how to convert; however, it has been
moved to os_dep/ioctl_linux.c where it is used.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-23 21:31:04 -05:00
parent 3c0fdf5c36
commit a01908ab27
29 changed files with 411 additions and 495 deletions

View file

@ -93,7 +93,7 @@ struct registry_priv
u8 rfintfs;
u8 lbkmode;
u8 hci;
NDIS_802_11_SSID ssid;
struct ndis_802_11_ssid ssid;
u8 network_mode; //infra, ad-hoc, auto
u8 channel;//ad-hoc support requirement
u8 wireless_mode;//A, B, G, auto
@ -126,7 +126,7 @@ struct registry_priv
u8 uapsd_acvi_en;
u8 uapsd_acvo_en;
WLAN_BSSID_EX dev_network;
struct wlan_bssid_ex dev_network;
#ifdef CONFIG_80211N_HT
u8 ht_enable;
@ -175,8 +175,8 @@ struct registry_priv
//For registry parameters
#define RGTRY_OFT(field) ((ULONG)FIELD_OFFSET(struct registry_priv,field))
#define RGTRY_SZ(field) sizeof(((struct registry_priv*) 0)->field)
#define BSSID_OFT(field) ((ULONG)FIELD_OFFSET(WLAN_BSSID_EX,field))
#define BSSID_SZ(field) sizeof(((PWLAN_BSSID_EX) 0)->field)
#define BSSID_OFT(field) ((ULONG)FIELD_OFFSET(struct wlan_bssid_ex,field))
#define BSSID_SZ(field) sizeof(((Pstruct wlan_bssid_ex) 0)->field)
#define MAX_CONTINUAL_URB_ERR 4

View file

@ -204,7 +204,7 @@ struct hal_ops {
void (*cancel_thread)(_adapter *padapter);
u8 (*AntDivBeforeLinkHandler)(_adapter *padapter);
void (*AntDivCompareHandler)(_adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src);
void (*AntDivCompareHandler)(_adapter *padapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src);
u8 (*interface_ps_func)(_adapter *padapter,HAL_INTF_PS_FUNC efunc_id, u8* val);
s32 (*hal_xmit)(_adapter *padapter, struct xmit_frame *pxmitframe);
@ -417,7 +417,7 @@ void rtw_hal_set_chan(_adapter *padapter, u8 channel);
void rtw_hal_dm_watchdog(_adapter *padapter);
u8 rtw_hal_antdiv_before_linked(_adapter *padapter);
void rtw_hal_antdiv_rssi_compared(_adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src);
void rtw_hal_antdiv_rssi_compared(_adapter *padapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src);
void rtw_hal_sreset_init(_adapter *padapter);
void rtw_hal_sreset_reset(_adapter *padapter);

View file

@ -1255,7 +1255,7 @@ u8 *rtw_get_p2p_ie(u8 *in_ie, int in_len, u8 *p2p_ie, uint *p2p_ielen);
u8 *rtw_get_p2p_attr(u8 *p2p_ie, uint p2p_ielen, u8 target_attr_id ,u8 *buf_attr, u32 *len_attr);
u8 *rtw_get_p2p_attr_content(u8 *p2p_ie, uint p2p_ielen, u8 target_attr_id ,u8 *buf_content, uint *len_content);
u32 rtw_set_p2p_attr_content(u8 *pbuf, u8 attr_id, u16 attr_len, u8 *pdata_attr);
void rtw_WLAN_BSSID_EX_remove_p2p_attr(WLAN_BSSID_EX *bss_ex, u8 attr_id);
void rtw_wlan_bssid_ex_remove_p2p_attr(struct wlan_bssid_ex *bss_ex, u8 attr_id);
#endif
uint rtw_get_rateset_len(u8 *rateset);

View file

@ -56,7 +56,7 @@ void rtl8188e_deinit_dm_priv(PADAPTER Adapter);
void rtl8188e_InitHalDm(PADAPTER Adapter);
void rtl8188e_HalDmWatchDog(PADAPTER Adapter);
void AntDivCompare8188E(PADAPTER Adapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src);
void AntDivCompare8188E(PADAPTER Adapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src);
u8 AntDivBeforeLink8188E(PADAPTER Adapter );
#endif

View file

@ -33,8 +33,8 @@ extern void rtw_indicate_sta_disassoc_event(_adapter *padapter, struct sta_info
void init_mlme_ap_info(_adapter *padapter);
void free_mlme_ap_info(_adapter *padapter);
//void update_BCNTIM(_adapter *padapter);
void rtw_add_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len);
void rtw_remove_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index);
void rtw_add_bcn_ie(_adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index, u8 *data, u8 len);
void rtw_remove_bcn_ie(_adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index);
void update_beacon(_adapter *padapter, u8 ie_id, u8 *oui, u8 tx);
void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level);
void expire_timeout_chk(_adapter *padapter);

View file

@ -178,7 +178,7 @@ Command Event Mode
*/
struct joinbss_parm {
WLAN_BSSID_EX network;
struct wlan_bssid_ex network;
};
/*
@ -201,7 +201,7 @@ Notes: To create a BSS
Command Mode
*/
struct createbss_parm {
WLAN_BSSID_EX network;
struct wlan_bssid_ex network;
};
/*
@ -243,7 +243,7 @@ struct sitesurvey_parm {
/* sint bsslimit; // 1 ~ 48 */
u8 ssid_num;
u8 ch_num;
NDIS_802_11_SSID ssid[RTW_SSID_SCAN_AMOUNT];
struct ndis_802_11_ssid ssid[RTW_SSID_SCAN_AMOUNT];
struct rtw_ieee80211_channel ch[RTW_CHANNEL_SCAN_AMOUNT];
};
@ -505,7 +505,7 @@ struct getrfintfs_parm {
struct Tx_Beacon_param
{
WLAN_BSSID_EX network;
struct wlan_bssid_ex network;
};
/*
@ -791,7 +791,7 @@ Result:
extern u8 rtw_setassocsta_cmd(_adapter *padapter, u8 *mac_addr);
extern u8 rtw_setstandby_cmd(_adapter *padapter, uint action);
u8 rtw_sitesurvey_cmd(_adapter *padapter, NDIS_802_11_SSID *ssid, int ssid_num, struct rtw_ieee80211_channel *ch, int ch_num);
u8 rtw_sitesurvey_cmd(_adapter *padapter, struct ndis_802_11_ssid *ssid, int ssid_num, struct rtw_ieee80211_channel *ch, int ch_num);
extern u8 rtw_createbss_cmd(_adapter *padapter);
extern u8 rtw_createbss_cmd_ex(_adapter *padapter, unsigned char *pbss, unsigned int sz);
extern u8 rtw_setphy_cmd(_adapter *padapter, u8 modem, u8 ch);
@ -799,7 +799,7 @@ extern u8 rtw_setstakey_cmd(_adapter *padapter, u8 *psta, u8 unicast_key);
extern u8 rtw_clearstakey_cmd(_adapter *padapter, u8 *psta, u8 entry, u8 enqueue);
extern u8 rtw_joinbss_cmd(_adapter *padapter, struct wlan_network* pnetwork);
u8 rtw_disassoc_cmd(_adapter *padapter, u32 deauth_timeout_ms, bool enqueue);
extern u8 rtw_setopmode_cmd(_adapter *padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype);
extern u8 rtw_setopmode_cmd(_adapter *padapter, enum ndis_802_11_network_infra networktype);
extern u8 rtw_setdatarate_cmd(_adapter *padapter, u8 *rateset);
extern u8 rtw_setbasicrate_cmd(_adapter *padapter, u8 *rateset);
extern u8 rtw_setbbreg_cmd(_adapter * padapter, u8 offset, u8 val);

View file

@ -34,7 +34,7 @@
Used to report a bss has been scanned
*/
struct survey_event {
WLAN_BSSID_EX bss;
struct wlan_bssid_ex bss;
};
/*
@ -116,7 +116,7 @@ struct c2hevent_queue {
struct network_queue {
volatile int head;
volatile int tail;
WLAN_BSSID_EX networks[NETWORK_QUEUE_SZ];
struct wlan_bssid_ex networks[NETWORK_QUEUE_SZ];
};

View file

@ -25,19 +25,19 @@
typedef u8 NDIS_802_11_PMKID_VALUE[16];
u8 rtw_set_802_11_add_key(_adapter * padapter, NDIS_802_11_KEY * key);
u8 rtw_set_802_11_authentication_mode(_adapter *pdapter, NDIS_802_11_AUTHENTICATION_MODE authmode);
u8 rtw_set_802_11_add_key(_adapter * padapter, struct ndis_802_11_key * key);
u8 rtw_set_802_11_authentication_mode(_adapter *pdapter, enum ndis_802_11_auth_mode authmode);
u8 rtw_set_802_11_bssid(_adapter* padapter, u8 *bssid);
u8 rtw_set_802_11_add_wep(_adapter * padapter, NDIS_802_11_WEP * wep);
u8 rtw_set_802_11_add_wep(_adapter * padapter, struct ndis_802_11_wep * wep);
u8 rtw_set_802_11_disassociate(_adapter * padapter);
u8 rtw_set_802_11_bssid_list_scan(_adapter* padapter, NDIS_802_11_SSID *pssid, int ssid_max_num);
u8 rtw_set_802_11_infrastructure_mode(_adapter * padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype);
u8 rtw_set_802_11_bssid_list_scan(_adapter* padapter, struct ndis_802_11_ssid *pssid, int ssid_max_num);
u8 rtw_set_802_11_infrastructure_mode(_adapter * padapter, enum ndis_802_11_network_infra networktype);
u8 rtw_set_802_11_remove_wep(_adapter * padapter, u32 keyindex);
u8 rtw_set_802_11_ssid(_adapter * padapter, NDIS_802_11_SSID * ssid);
u8 rtw_set_802_11_remove_key(_adapter * padapter, NDIS_802_11_REMOVE_KEY * key);
u8 rtw_set_802_11_ssid(_adapter * padapter, struct ndis_802_11_ssid * ssid);
u8 rtw_set_802_11_remove_key(_adapter * padapter, struct ndis_802_11_remove_key * key);
u8 rtw_validate_ssid(NDIS_802_11_SSID *ssid);
u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid);
u16 rtw_get_cur_max_rate(_adapter *adapter);
int rtw_set_scan_mode(_adapter *adapter, RT_SCAN_TYPE scan_mode);

View file

@ -154,7 +154,7 @@ struct tx_invite_resp_info{
struct tx_provdisc_req_info{
u16 wps_config_method_request; // Used when sending the provisioning request frame
u16 peer_channel_num[2]; // The channel number which the receiver stands.
NDIS_802_11_SSID ssid;
struct ndis_802_11_ssid ssid;
u8 peerDevAddr[ ETH_ALEN ]; // Peer device address
u8 peerIFAddr[ ETH_ALEN ]; // Peer interface address
u8 benable; // This provision discovery request frame is trigger to send or not
@ -305,7 +305,7 @@ struct mlme_priv {
u8 *free_bss_buf;
u32 num_of_scanned;
NDIS_802_11_SSID assoc_ssid;
struct ndis_802_11_ssid assoc_ssid;
u8 assoc_bssid[6];
struct wlan_network cur_network;
@ -546,8 +546,8 @@ __inline static void set_scanned_network_val(struct mlme_priv *pmlmepriv, sint v
_exit_critical_bh(&pmlmepriv->lock, &irqL);
}
extern u16 rtw_get_capability(WLAN_BSSID_EX *bss);
extern void rtw_update_scanned_network(_adapter *adapter, WLAN_BSSID_EX *target);
extern u16 rtw_get_capability(struct wlan_bssid_ex *bss);
extern void rtw_update_scanned_network(_adapter *adapter, struct wlan_bssid_ex *target);
extern void rtw_disconnect_hdl_under_linked(_adapter* adapter, struct sta_info *psta, u8 free_assoc);
extern void rtw_generate_random_ibss(u8 *pibss);
extern struct wlan_network* rtw_find_network(_queue *scanned_queue, u8 *addr);
@ -615,7 +615,7 @@ void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe);
#endif
int rtw_is_same_ibss(_adapter *adapter, struct wlan_network *pnetwork);
int is_same_network(WLAN_BSSID_EX *src, WLAN_BSSID_EX *dst);
int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst);
void rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network);
void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network);

View file

@ -296,7 +296,7 @@ struct ss_res
int scan_mode;
u8 ssid_num;
u8 ch_num;
NDIS_802_11_SSID ssid[RTW_SSID_SCAN_AMOUNT];
struct ndis_802_11_ssid ssid[RTW_SSID_SCAN_AMOUNT];
struct rtw_ieee80211_channel ch[RTW_CHANNEL_SCAN_AMOUNT];
};
@ -324,7 +324,7 @@ struct FW_Sta_Info {
u32 status;
u32 rx_pkt;
u32 retry;
NDIS_802_11_RATES_EX SupportedRates;
unsigned char SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
};
/*
@ -387,7 +387,7 @@ struct mlme_ext_info {
struct WMM_para_element WMM_param;
struct HT_caps_element HT_caps;
struct HT_info_element HT_info;
WLAN_BSSID_EX network;//join network or bss_network, if in ap mode, it is the same to cur_network.network
struct wlan_bssid_ex network;//join network or bss_network, if in ap mode, it is the same to cur_network.network
struct FW_Sta_Info FW_sta_info[NUM_STA];
};
@ -529,12 +529,12 @@ void flush_all_cam_entry(_adapter *padapter);
bool IsLegal5GChannel(PADAPTER Adapter, u8 channel);
void site_survey(_adapter *padapter);
u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSID_EX *bssid);
void update_network(WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src, _adapter * padapter, bool update_ie);
u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, struct wlan_bssid_ex *bssid);
void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, _adapter * padapter, bool update_ie);
int get_bsstype(unsigned short capability);
u8* get_my_bssid(WLAN_BSSID_EX *pnetwork);
u16 get_beacon_interval(WLAN_BSSID_EX *bss);
u8* get_my_bssid(struct wlan_bssid_ex *pnetwork);
u16 get_beacon_interval(struct wlan_bssid_ex *bss);
int is_client_associated_to_ap(_adapter *padapter);
int is_client_associated_to_ibss(_adapter *padapter);
@ -542,14 +542,14 @@ int is_IBSS_empty(_adapter *padapter);
unsigned char check_assoc_AP(u8 *pframe, uint len);
int WMM_param_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE);
int WMM_param_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE);
void WMMOnAssocRsp(_adapter *padapter);
void HT_caps_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE);
void HT_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE);
void HT_caps_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE);
void HT_info_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE);
void HTOnAssocRsp(_adapter *padapter);
void ERP_IE_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE);
void ERP_IE_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE);
void VCS_update(_adapter *padapter, struct sta_info *psta);
void update_beacon_info(_adapter *padapter, u8 *pframe, uint len, struct sta_info *psta);
@ -606,8 +606,8 @@ void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probe
void issue_assocreq(_adapter *padapter);
void issue_asocrsp(_adapter *padapter, unsigned short status, struct sta_info *pstat, int pkt_type);
void issue_auth(_adapter *padapter, struct sta_info *psta, unsigned short status);
void issue_probereq(_adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da);
s32 issue_probereq_ex(_adapter *padapter, NDIS_802_11_SSID *pssid, u8* da, int try_cnt, int wait_ms);
void issue_probereq(_adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da);
s32 issue_probereq_ex(_adapter *padapter, struct ndis_802_11_ssid *pssid, u8* da, int try_cnt, int wait_ms);
int issue_nulldata(_adapter *padapter, unsigned char *da, unsigned int power_mode, int try_cnt, int wait_ms);
int issue_qos_nulldata(_adapter *padapter, unsigned char *da, u16 tid, int try_cnt, int wait_ms);
int issue_deauth(_adapter *padapter, unsigned char *da, unsigned short reason);

View file

@ -357,21 +357,17 @@ struct mp_priv
u8 txpoweridx_b;
u8 rateidx;
u32 preamble;
// u8 modem;
u32 CrystalCap;
// u32 curr_crystalcap;
u16 antenna_tx;
u16 antenna_rx;
// u8 curr_rfpath;
u8 check_mp_pkt;
u8 bSetTxPower;
// uint ForcedDataRate;
struct wlan_network mp_network;
NDIS_802_11_MAC_ADDRESS network_macaddr;
unsigned char network_macaddr[ETH_ALEN];
u8 *pallocated_mp_xmitframe_buf;
u8 *pmp_xmtframe_buf;

View file

@ -160,9 +160,9 @@ struct security_priv
u32 ndisauthtype; // NDIS_802_11_AUTHENTICATION_MODE
u32 ndisencryptstatus; // NDIS_802_11_ENCRYPTION_STATUS
WLAN_BSSID_EX sec_bss; //for joinbss (h2c buffer) usage
struct wlan_bssid_ex sec_bss; //for joinbss (h2c buffer) usage
NDIS_802_11_WEP ndiswep;
struct ndis_802_11_wep ndiswep;
u8 assoc_info[600];
u8 szofcapability[256]; //for wpa2 usage
u8 oidassociation[512]; //for wpa/wpa2 usage

View file

@ -27,101 +27,74 @@
#define NDIS_802_11_LENGTH_RATES 8
#define NDIS_802_11_LENGTH_RATES_EX 16
typedef unsigned char NDIS_802_11_MAC_ADDRESS[6];
typedef long NDIS_802_11_RSSI; // in dBm
typedef unsigned char NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES]; // Set of 8 data rates
typedef unsigned char NDIS_802_11_RATES_EX[NDIS_802_11_LENGTH_RATES_EX]; // Set of 16 data rates
#define NDIS_802_11_RSSI long // in dBm
struct ndis_802_11_ssid {
ULONG SsidLength;
UCHAR Ssid[32];
};
typedef ULONG NDIS_802_11_KEY_INDEX;
typedef unsigned long long NDIS_802_11_KEY_RSC;
enum NDIS_802_11_NETWORK_TYPE {
Ndis802_11FH,
Ndis802_11DS,
Ndis802_11OFDM5,
Ndis802_11OFDM24,
Ndis802_11NetworkTypeMax // not a real type, defined as an upper bound
};
typedef struct _NDIS_802_11_SSID
{
ULONG SsidLength;
UCHAR Ssid[32];
} NDIS_802_11_SSID, *PNDIS_802_11_SSID;
typedef enum _NDIS_802_11_NETWORK_TYPE
{
Ndis802_11FH,
Ndis802_11DS,
Ndis802_11OFDM5,
Ndis802_11OFDM24,
Ndis802_11NetworkTypeMax // not a real type, defined as an upper bound
} NDIS_802_11_NETWORK_TYPE, *PNDIS_802_11_NETWORK_TYPE;
typedef struct _NDIS_802_11_CONFIGURATION_FH
{
ULONG Length; // Length of structure
ULONG HopPattern; // As defined by 802.11, MSB set
ULONG HopSet; // to one if non-802.11
ULONG DwellTime; // units are Kusec
} NDIS_802_11_CONFIGURATION_FH, *PNDIS_802_11_CONFIGURATION_FH;
struct ndis_802_11_config_fh {
ULONG Length; // Length of structure
ULONG HopPattern; // As defined by 802.11, MSB set
ULONG HopSet; // to one if non-802.11
ULONG DwellTime; // units are Kusec
};
/*
FW will only save the channel number in DSConfig.
ODI Handler will convert the channel number to freq. number.
*/
typedef struct _NDIS_802_11_CONFIGURATION
{
ULONG Length; // Length of structure
ULONG BeaconPeriod; // units are Kusec
ULONG ATIMWindow; // units are Kusec
ULONG DSConfig; // Frequency, units are kHz
NDIS_802_11_CONFIGURATION_FH FHConfig;
} NDIS_802_11_CONFIGURATION, *PNDIS_802_11_CONFIGURATION;
struct ndis_802_11_config {
ULONG Length; // Length of structure
ULONG BeaconPeriod; // units are Kusec
ULONG ATIMWindow; // units are Kusec
ULONG DSConfig; // Frequency, units are kHz
struct ndis_802_11_config_fh FHConfig;
};
typedef enum _NDIS_802_11_NETWORK_INFRASTRUCTURE
{
enum ndis_802_11_network_infra {
Ndis802_11IBSS,
Ndis802_11Infrastructure,
Ndis802_11AutoUnknown,
Ndis802_11InfrastructureMax, // Not a real value, defined as upper bound
Ndis802_11APMode
} NDIS_802_11_NETWORK_INFRASTRUCTURE, *PNDIS_802_11_NETWORK_INFRASTRUCTURE;
};
typedef struct _NDIS_802_11_FIXED_IEs
{
struct ndis_802_11_fixed_ie {
UCHAR Timestamp[8];
USHORT BeaconInterval;
USHORT Capabilities;
} NDIS_802_11_FIXED_IEs, *PNDIS_802_11_FIXED_IEs;
};
typedef struct _NDIS_802_11_VARIABLE_IEs
{
UCHAR ElementID;
UCHAR Length;
UCHAR data[1];
} NDIS_802_11_VARIABLE_IEs, *PNDIS_802_11_VARIABLE_IEs;
struct ndis_802_11_var_ie {
UCHAR ElementID;
UCHAR Length;
UCHAR data[1];
};
/*
Length is the 4 bytes multiples of the sume of
sizeof (NDIS_802_11_MAC_ADDRESS) + 2 + sizeof (NDIS_802_11_SSID) + sizeof (ULONG)
+ sizeof (NDIS_802_11_RSSI) + sizeof (NDIS_802_11_NETWORK_TYPE) + sizeof (NDIS_802_11_CONFIGURATION)
+ sizeof (NDIS_802_11_RATES_EX) + IELength
[ETH_ALEN] + 2 + sizeof (struct ndis_802_11_ssid) + sizeof (ULONG)
+ sizeof (NDIS_802_11_RSSI) + sizeof (enum NDIS_802_11_NETWORK_TYPE) + sizeof (struct ndis_802_11_config)
+ NDIS_802_11_LENGTH_RATES_EX + IELength
Except the IELength, all other fields are fixed length. Therefore, we can define a marco to present the
Except the IELength, all other fields are fixed length. Therefore, we can define a macro to represent the
partial sum.
*/
typedef enum _NDIS_802_11_AUTHENTICATION_MODE
{
enum ndis_802_11_auth_mode {
Ndis802_11AuthModeOpen,
Ndis802_11AuthModeShared,
Ndis802_11AuthModeAutoSwitch,
@ -130,10 +103,9 @@ typedef enum _NDIS_802_11_AUTHENTICATION_MODE
Ndis802_11AuthModeWPANone,
Ndis802_11AuthModeWAPI,
Ndis802_11AuthModeMax // Not a real mode, defined as upper bound
} NDIS_802_11_AUTHENTICATION_MODE, *PNDIS_802_11_AUTHENTICATION_MODE;
};
typedef enum _NDIS_802_11_WEP_STATUS
{
enum ndis_802_11_wep_status {
Ndis802_11WEPEnabled,
Ndis802_11Encryption1Enabled = Ndis802_11WEPEnabled,
Ndis802_11WEPDisabled,
@ -146,9 +118,8 @@ typedef enum _NDIS_802_11_WEP_STATUS
Ndis802_11Encryption2KeyAbsent,
Ndis802_11Encryption3Enabled,
Ndis802_11Encryption3KeyAbsent,
Ndis802_11_EncrypteionWAPI
} NDIS_802_11_WEP_STATUS, *PNDIS_802_11_WEP_STATUS,
NDIS_802_11_ENCRYPTION_STATUS, *PNDIS_802_11_ENCRYPTION_STATUS;
Ndis802_11_EncryptionWAPI
};
#define NDIS_802_11_AI_REQFI_CAPABILITIES 1
@ -159,84 +130,74 @@ typedef enum _NDIS_802_11_WEP_STATUS
#define NDIS_802_11_AI_RESFI_STATUSCODE 2
#define NDIS_802_11_AI_RESFI_ASSOCIATIONID 4
typedef struct _NDIS_802_11_AI_REQFI
{
struct ndis_802_11_ai_reqfi {
USHORT Capabilities;
USHORT ListenInterval;
NDIS_802_11_MAC_ADDRESS CurrentAPAddress;
} NDIS_802_11_AI_REQFI, *PNDIS_802_11_AI_REQFI;
unsigned char CurrentAPAddress[ETH_ALEN];
};
typedef struct _NDIS_802_11_AI_RESFI
{
struct ndis_802_11_ai_resfi {
USHORT Capabilities;
USHORT StatusCode;
USHORT AssociationId;
} NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI;
};
typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION
{
struct ndis_802_11_assoc_info {
ULONG Length;
USHORT AvailableRequestFixedIEs;
NDIS_802_11_AI_REQFI RequestFixedIEs;
struct ndis_802_11_ai_reqfi RequestFixedIEs;
ULONG RequestIELength;
ULONG OffsetRequestIEs;
USHORT AvailableResponseFixedIEs;
NDIS_802_11_AI_RESFI ResponseFixedIEs;
struct ndis_802_11_ai_resfi ResponseFixedIEs;
ULONG ResponseIELength;
ULONG OffsetResponseIEs;
} NDIS_802_11_ASSOCIATION_INFORMATION, *PNDIS_802_11_ASSOCIATION_INFORMATION;
};
typedef enum _NDIS_802_11_RELOAD_DEFAULTS
{
Ndis802_11ReloadWEPKeys
} NDIS_802_11_RELOAD_DEFAULTS, *PNDIS_802_11_RELOAD_DEFAULTS;
enum ndis_802_11_reload_def {
Ndis802_11ReloadWEPKeys
};
// Key mapping keys require a BSSID
typedef struct _NDIS_802_11_KEY
{
ULONG Length; // Length of this structure
ULONG KeyIndex;
ULONG KeyLength; // length of key in bytes
NDIS_802_11_MAC_ADDRESS BSSID;
NDIS_802_11_KEY_RSC KeyRSC;
UCHAR KeyMaterial[32]; // variable length depending on above field
} NDIS_802_11_KEY, *PNDIS_802_11_KEY;
struct ndis_802_11_key {
ULONG Length; // Length of this structure
ULONG KeyIndex;
ULONG KeyLength; // length of key in bytes
unsigned char BSSID[ETH_ALEN];
unsigned long long KeyRSC;
UCHAR KeyMaterial[32]; // variable length depending on above field
};
typedef struct _NDIS_802_11_REMOVE_KEY
{
ULONG Length; // Length of this structure
ULONG KeyIndex;
NDIS_802_11_MAC_ADDRESS BSSID;
} NDIS_802_11_REMOVE_KEY, *PNDIS_802_11_REMOVE_KEY;
struct ndis_802_11_remove_key {
ULONG Length; // Length of this structure
ULONG KeyIndex;
unsigned char BSSID[ETH_ALEN];
};
typedef struct _NDIS_802_11_WEP
{
ULONG Length; // Length of this structure
ULONG KeyIndex; // 0 is the per-client key, 1-N are the global keys
ULONG KeyLength; // length of key in bytes
UCHAR KeyMaterial[16];// variable length depending on above field
} NDIS_802_11_WEP, *PNDIS_802_11_WEP;
struct ndis_802_11_wep {
ULONG Length; // Length of this structure
ULONG KeyIndex; // 0 is the per-client key, 1-N are the global keys
ULONG KeyLength; // length of key in bytes
UCHAR KeyMaterial[16];// variable length depending on above field
};
typedef struct _NDIS_802_11_AUTHENTICATION_REQUEST
{
struct ndis_802_11_auth_req {
ULONG Length; // Length of structure
NDIS_802_11_MAC_ADDRESS Bssid;
unsigned char Bssid[ETH_ALEN];
ULONG Flags;
} NDIS_802_11_AUTHENTICATION_REQUEST, *PNDIS_802_11_AUTHENTICATION_REQUEST;
};
typedef enum _NDIS_802_11_STATUS_TYPE
{
enum ndis_802_11_status_type {
Ndis802_11StatusType_Authentication,
Ndis802_11StatusType_MediaStreamMode,
Ndis802_11StatusType_PMKID_CandidateList,
Ndis802_11StatusTypeMax // not a real type, defined as an upper bound
} NDIS_802_11_STATUS_TYPE, *PNDIS_802_11_STATUS_TYPE;
};
typedef struct _NDIS_802_11_STATUS_INDICATION
{
NDIS_802_11_STATUS_TYPE StatusType;
} NDIS_802_11_STATUS_INDICATION, *PNDIS_802_11_STATUS_INDICATION;
struct ndis_802_11_status_ind {
enum ndis_802_11_status_type StatusType;
};
// mask for authentication/integrity fields
#define NDIS_802_11_AUTH_REQUEST_AUTH_FIELDS 0x0f
@ -248,38 +209,34 @@ typedef struct _NDIS_802_11_STATUS_INDICATION
// MIC check time, 60 seconds.
#define MIC_CHECK_TIME 60000000
typedef struct _NDIS_802_11_AUTHENTICATION_EVENT
{
NDIS_802_11_STATUS_INDICATION Status;
NDIS_802_11_AUTHENTICATION_REQUEST Request[1];
} NDIS_802_11_AUTHENTICATION_EVENT, *PNDIS_802_11_AUTHENTICATION_EVENT;
struct ndis_802_11_auth_evt {
struct ndis_802_11_status_ind Status;
struct ndis_802_11_auth_req Request[1];
};
typedef struct _NDIS_802_11_TEST
{
struct ndis_802_11_test {
ULONG Length;
ULONG Type;
union
{
NDIS_802_11_AUTHENTICATION_EVENT AuthenticationEvent;
struct ndis_802_11_auth_evt AuthenticationEvent;
NDIS_802_11_RSSI RssiTrigger;
}tt;
} NDIS_802_11_TEST, *PNDIS_802_11_TEST;
};
#ifndef Ndis802_11APMode
#define Ndis802_11APMode (Ndis802_11InfrastructureMax+1)
#endif
typedef struct _WLAN_PHY_INFO
{
struct wlan_phy_info {
u8 SignalStrength;//(in percentage)
u8 SignalQuality;//(in percentage)
u8 Optimum_antenna; //for Antenna diversity
u8 Reserved_0;
}WLAN_PHY_INFO,*PWLAN_PHY_INFO;
};
typedef struct _WLAN_BCN_INFO
{
struct wlan_bcn_info {
/* these infor get from rtw_get_encrypt_info when
* * translate scan to UI */
u8 encryp_protocol;//ENCRYP_PROTOCOL_E: OPEN/WEP/WPA/WPA2/WAPI
@ -290,32 +247,30 @@ typedef struct _WLAN_BCN_INFO
/* bwmode 20/40 and ch_offset UP/LOW */
unsigned short ht_cap_info;
unsigned char ht_info_infos_0;
}WLAN_BCN_INFO,*PWLAN_BCN_INFO;
};
/* temporally add #pragma pack for structure alignment issue of
* WLAN_BSSID_EX and get_WLAN_BSSID_EX_sz()
* struct wlan_bssid_ex and get_struct wlan_bssid_ex_sz()
*/
typedef struct _WLAN_BSSID_EX
{
ULONG Length;
NDIS_802_11_MAC_ADDRESS MacAddress;
UCHAR Reserved[2];//[0]: IS beacon frame
NDIS_802_11_SSID Ssid;
ULONG Privacy;
NDIS_802_11_RSSI Rssi;//(in dBM,raw data ,get from PHY)
NDIS_802_11_NETWORK_TYPE NetworkTypeInUse;
NDIS_802_11_CONFIGURATION Configuration;
NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
WLAN_PHY_INFO PhyInfo;
ULONG IELength;
UCHAR IEs[MAX_IE_SZ]; //(timestamp, beacon interval, and capability information)
} __attribute__((packed))
WLAN_BSSID_EX, *PWLAN_BSSID_EX;
struct wlan_bssid_ex {
ULONG Length;
unsigned char MacAddress[ETH_ALEN];
UCHAR Reserved[2];//[0]: IS beacon frame
struct ndis_802_11_ssid Ssid;
ULONG Privacy;
NDIS_802_11_RSSI Rssi;//(in dBM,raw data ,get from PHY)
enum NDIS_802_11_NETWORK_TYPE NetworkTypeInUse;
struct ndis_802_11_config Configuration;
enum ndis_802_11_network_infra InfrastructureMode;
unsigned char SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
struct wlan_phy_info PhyInfo;
ULONG IELength;
UCHAR IEs[MAX_IE_SZ]; //(timestamp, beacon interval, and capability information)
} __packed;
__inline static uint get_WLAN_BSSID_EX_sz(WLAN_BSSID_EX *bss)
static inline uint get_wlan_bssid_ex_sz(struct wlan_bssid_ex *bss)
{
return sizeof(WLAN_BSSID_EX) - MAX_IE_SZ + bss->IELength;
return sizeof(struct wlan_bssid_ex) - MAX_IE_SZ + bss->IELength;
}
struct wlan_network {
@ -325,34 +280,30 @@ struct wlan_network {
unsigned long last_scanned; //timestamp for the network
int aid; //will only be valid when a BSS is joinned.
int join_res;
WLAN_BSSID_EX network; //must be the last item
WLAN_BCN_INFO BcnInfo;
struct wlan_bssid_ex network; //must be the last item
struct wlan_bcn_info BcnInfo;
};
enum VRTL_CARRIER_SENSE
{
DISABLE_VCS,
ENABLE_VCS,
AUTO_VCS
DISABLE_VCS,
ENABLE_VCS,
AUTO_VCS
};
enum VCS_TYPE
{
NONE_VCS,
RTS_CTS,
CTS_TO_SELF
NONE_VCS,
RTS_CTS,
CTS_TO_SELF
};
#define PWR_CAM 0
#define PWR_MINPS 1
#define PWR_MAXPS 2
#define PWR_UAPSD 3
#define PWR_VOIP 4
enum UAPSD_MAX_SP
{
NO_LIMIT,
@ -361,8 +312,6 @@ enum UAPSD_MAX_SP
SIX_MSDU
};
//john
#define NUM_PRE_AUTH_KEY 16
#define NUM_PMKID_CACHE NUM_PRE_AUTH_KEY
@ -370,35 +319,29 @@ enum UAPSD_MAX_SP
* WPA2
*/
typedef struct _PMKID_CANDIDATE {
NDIS_802_11_MAC_ADDRESS BSSID;
ULONG Flags;
} PMKID_CANDIDATE, *PPMKID_CANDIDATE;
struct pmkid_candidate {
unsigned char BSSID[ETH_ALEN];
ULONG Flags;
};
typedef struct _NDIS_802_11_PMKID_CANDIDATE_LIST
{
ULONG Version; // Version of the structure
ULONG NumCandidates; // No. of pmkid candidates
PMKID_CANDIDATE CandidateList[1];
} NDIS_802_11_PMKID_CANDIDATE_LIST, *PNDIS_802_11_PMKID_CANDIDATE_LIST;
struct ndis_802_11_pmkid_list {
ULONG Version; // Version of the structure
ULONG NumCandidates; // No. of pmkid candidates
struct pmkid_candidate CandidateList[1];
};
struct ndis_802_11_auth_encrypt {
enum ndis_802_11_auth_mode AuthModeSupported;
enum ndis_802_11_wep_status EncryptStatusSupported;
};
typedef struct _NDIS_802_11_AUTHENTICATION_ENCRYPTION
{
NDIS_802_11_AUTHENTICATION_MODE AuthModeSupported;
NDIS_802_11_ENCRYPTION_STATUS EncryptStatusSupported;
} NDIS_802_11_AUTHENTICATION_ENCRYPTION, *PNDIS_802_11_AUTHENTICATION_ENCRYPTION;
typedef struct _NDIS_802_11_CAPABILITY
{
struct ndis_802_11_cap {
ULONG Length;
ULONG Version;
ULONG NoOfPMKIDs;
ULONG NoOfAuthEncryptPairsSupported;
NDIS_802_11_AUTHENTICATION_ENCRYPTION AuthenticationEncryptionSupported[1];
} NDIS_802_11_CAPABILITY, *PNDIS_802_11_CAPABILITY;
struct ndis_802_11_auth_encrypt AuthenticationEncryptionSupported[1];
};
u8 key_2char2num(u8 hch, u8 lch);
u8 key_char2num(u8 ch);