diff options
Diffstat (limited to 'drivers/staging/rtl8723bs/include')
-rw-r--r-- | drivers/staging/rtl8723bs/include/cmd_osdep.h | 6 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/drv_types.h | 10 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/drv_types_sdio.h | 4 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/ieee80211.h | 15 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/rtw_cmd.h | 6 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/rtw_mlme.h | 31 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 30 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/rtw_recv.h | 6 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/wifi.h | 86 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/wlan_bssdef.h | 56 |
11 files changed, 104 insertions, 148 deletions
diff --git a/drivers/staging/rtl8723bs/include/cmd_osdep.h b/drivers/staging/rtl8723bs/include/cmd_osdep.h index 0749936df032..d3af9f44ad59 100644 --- a/drivers/staging/rtl8723bs/include/cmd_osdep.h +++ b/drivers/staging/rtl8723bs/include/cmd_osdep.h @@ -8,11 +8,11 @@ #define __CMD_OSDEP_H_ -extern sint _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv); -extern sint _rtw_init_evt_priv(struct evt_priv *pevtpriv); +int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv); +int rtw_init_evt_priv(struct evt_priv *pevtpriv); extern void _rtw_free_evt_priv (struct evt_priv *pevtpriv); extern void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv); -extern sint _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj); +int _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj); extern struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue); #endif diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h index bafb2c30e7fb..0fd84c93e72b 100644 --- a/drivers/staging/rtl8723bs/include/drv_types.h +++ b/drivers/staging/rtl8723bs/include/drv_types.h @@ -37,10 +37,6 @@ enum _NIC_VERSION { #include <rtw_ht.h> -#ifdef CONFIG_INTEL_WIDI -#include <rtw_intel_widi.h> -#endif - #include <rtw_cmd.h> #include <cmd_osdep.h> #include <rtw_security.h> @@ -220,7 +216,6 @@ struct registry_priv #define BSSID_SZ(field) sizeof(((struct wlan_bssid_ex *) 0)->field) #include <drv_types_sdio.h> -#define INTF_DATA SDIO_DATA #define is_primary_adapter(adapter) (1) #define get_iface_type(adapter) (IFACE_PORT0) @@ -476,9 +471,8 @@ struct dvobj_priv /*-------- below is for SDIO INTERFACE --------*/ -#ifdef INTF_DATA - INTF_DATA intf_data; -#endif +struct sdio_data intf_data; + }; #define dvobj_to_pwrctl(dvobj) (&(dvobj->pwrctl_priv)) diff --git a/drivers/staging/rtl8723bs/include/drv_types_sdio.h b/drivers/staging/rtl8723bs/include/drv_types_sdio.h index 23bf30ece2df..09263ad27ce9 100644 --- a/drivers/staging/rtl8723bs/include/drv_types_sdio.h +++ b/drivers/staging/rtl8723bs/include/drv_types_sdio.h @@ -16,7 +16,7 @@ #include <linux/mmc/card.h> #endif -typedef struct sdio_data +struct sdio_data { u8 func_number; @@ -26,6 +26,6 @@ typedef struct sdio_data struct sdio_func *func; void *sys_sdio_irq_thd; -} SDIO_DATA, *PSDIO_DATA; +}; #endif diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h index 9efb4dcb9d3a..74c028fbe8f7 100644 --- a/drivers/staging/rtl8723bs/include/ieee80211.h +++ b/drivers/staging/rtl8723bs/include/ieee80211.h @@ -202,7 +202,7 @@ enum NETWORK_TYPE #define IsSupportedVHT(NetType) (((NetType) & (WIRELESS_11AC)) ? true : false) -typedef struct ieee_param { +struct ieee_param { u32 cmd; u8 sta_addr[ETH_ALEN]; union { @@ -240,13 +240,13 @@ typedef struct ieee_param { u8 buf[0]; } bcn_ie; } u; -}ieee_param; +}; -typedef struct ieee_param_ex { +struct ieee_param_ex { u32 cmd; u8 sta_addr[ETH_ALEN]; u8 data[0]; -}ieee_param_ex; +}; struct sta_data{ u16 aid; @@ -870,13 +870,6 @@ static inline int is_zero_mac_addr(const u8 *addr) #define CFG_IEEE80211_RESERVE_FCS (1<<0) #define CFG_IEEE80211_COMPUTE_FCS (1<<1) -typedef struct tx_pending_t{ - int frag; - struct ieee80211_txb *txb; -}tx_pending_t; - - - #define MAXTID 16 #define IEEE_A (1<<0) diff --git a/drivers/staging/rtl8723bs/include/rtw_cmd.h b/drivers/staging/rtl8723bs/include/rtw_cmd.h index 299b55538788..b83824ca2e31 100644 --- a/drivers/staging/rtl8723bs/include/rtw_cmd.h +++ b/drivers/staging/rtl8723bs/include/rtw_cmd.h @@ -122,17 +122,15 @@ struct P2P_PS_CTWPeriod_t { u8 CTWPeriod; /* TU */ }; -extern u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *obj); +int rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *obj); extern struct cmd_obj *rtw_dequeue_cmd(struct cmd_priv *pcmdpriv); extern void rtw_free_cmd_obj(struct cmd_obj *pcmd); void rtw_stop_cmd_thread(struct adapter *adapter); int rtw_cmd_thread(void *context); -extern u32 rtw_init_cmd_priv (struct cmd_priv *pcmdpriv); extern void rtw_free_cmd_priv (struct cmd_priv *pcmdpriv); -extern u32 rtw_init_evt_priv (struct evt_priv *pevtpriv); extern void rtw_free_evt_priv (struct evt_priv *pevtpriv); extern void rtw_evt_notify_isr(struct evt_priv *pevtpriv); @@ -829,7 +827,7 @@ Result: u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid, int ssid_num, struct rtw_ieee80211_channel *ch, int ch_num); extern u8 rtw_createbss_cmd(struct adapter *padapter); -u8 rtw_startbss_cmd(struct adapter *padapter, int flags); +int rtw_startbss_cmd(struct adapter *padapter, int flags); struct sta_info; extern u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_key, bool enqueue); diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h index 1ea9ea0e8d2e..2693b554f414 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -454,33 +454,6 @@ struct mlme_priv { _lock bcn_update_lock; u8 update_bcn; -#ifdef CONFIG_INTEL_WIDI - int widi_state; - int listen_state; - _timer listen_timer; - atomic_t rx_probe_rsp; /* 1:receive probe respone from RDS source. */ - u8 *l2sdTaBuffer; - u8 channel_idx; - u8 group_cnt; /* In WiDi 3.5, they specified another scan algo. for WFD/RDS co-existed */ - u8 sa_ext[L2SDTA_SERVICE_VE_LEN]; - - u8 widi_enable; - /** - * For WiDi 4; upper layer would set - * p2p_primary_device_type_category_id - * p2p_primary_device_type_sub_category_id - * p2p_secondary_device_type_category_id - * p2p_secondary_device_type_sub_category_id - */ - u16 p2p_pdt_cid; - u16 p2p_pdt_scid; - u8 num_p2p_sdt; - u16 p2p_sdt_cid[MAX_NUM_P2P_SDT]; - u16 p2p_sdt_scid[MAX_NUM_P2P_SDT]; - u8 p2p_reject_disable; /* When starting NL80211 wpa_supplicant/hostapd, it will call netdev_close */ - /* such that it will cause p2p disabled. Use this flag to reject. */ -#endif /* CONFIG_INTEL_WIDI */ - u8 NumOfBcnInfoChkFail; unsigned long timeBcnInfoChkStart; }; @@ -619,15 +592,13 @@ void rtw_clear_scan_deny(struct adapter *adapter); void rtw_set_scan_deny_timer_hdl(struct adapter *adapter); void rtw_set_scan_deny(struct adapter *adapter, u32 ms); -extern int _rtw_init_mlme_priv(struct adapter *padapter); - void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv); extern void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv); /* extern struct wlan_network* _rtw_dequeue_network(struct __queue *queue); */ -extern struct wlan_network* _rtw_alloc_network(struct mlme_priv *pmlmepriv); +extern struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv); extern void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 isfreeall); diff --git a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h index e2a4c680125f..2bc922ce5ae1 100644 --- a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h +++ b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h @@ -159,7 +159,7 @@ enum PS_DENY_REASON { }; #ifdef CONFIG_PNO_SUPPORT -typedef struct pno_nlo_info +struct pno_nlo_info { u32 fast_scan_period; /* Fast scan period */ u32 ssid_num; /* number of entry */ @@ -168,26 +168,26 @@ typedef struct pno_nlo_info u8 ssid_length[MAX_PNO_LIST_COUNT]; /* SSID Length Array */ u8 ssid_cipher_info[MAX_PNO_LIST_COUNT]; /* Cipher information for security */ u8 ssid_channel_info[MAX_PNO_LIST_COUNT]; /* channel information */ -}pno_nlo_info_t; +}; -typedef struct pno_ssid { +struct pno_ssid { u32 SSID_len; u8 SSID[32]; -} pno_ssid_t; +}; -typedef struct pno_ssid_list { - pno_ssid_t node[MAX_PNO_LIST_COUNT]; -}pno_ssid_list_t; +struct pno_ssid_list { + struct pno_ssid node[MAX_PNO_LIST_COUNT]; +}; -typedef struct pno_scan_channel_info +struct pno_scan_channel_info { u8 channel; u8 tx_power; u8 timeout; u8 active; /* set 1 means active scan, or pasivite scan. */ -}pno_scan_channel_info_t; +}; -typedef struct pno_scan_info +struct pno_scan_info { u8 enableRFE; /* Enable RFE */ u8 period_scan_time; /* exclusive with fast_scan_period and slow_scan_period */ @@ -198,8 +198,8 @@ typedef struct pno_scan_info u8 orig_ch; /* original channel */ u8 channel_num; /* number of channel */ u64 rfe_type; /* rfe_type && 0x00000000000000ff */ - pno_scan_channel_info_t ssid_channel_info[MAX_SCAN_LIST_COUNT]; -}pno_scan_info_t; + struct pno_scan_channel_info ssid_channel_info[MAX_SCAN_LIST_COUNT]; +}; #endif /* CONFIG_PNO_SUPPORT */ struct pwrctrl_priv @@ -279,9 +279,9 @@ struct pwrctrl_priv #ifdef CONFIG_PNO_SUPPORT u8 pno_in_resume; u8 pno_inited; - pno_nlo_info_t *pnlo_info; - pno_scan_info_t *pscan_info; - pno_ssid_list_t *pno_ssid_list; + struct pno_nlo_info *pnlo_info; + struct pno_scan_info *pscan_info; + struct pno_ssid_list *pno_ssid_list; #endif u32 wowlan_pattern_context[8][5]; u64 wowlan_fw_iv; diff --git a/drivers/staging/rtl8723bs/include/rtw_recv.h b/drivers/staging/rtl8723bs/include/rtw_recv.h index 1f53c1c7b0da..5de946e66302 100644 --- a/drivers/staging/rtl8723bs/include/rtw_recv.h +++ b/drivers/staging/rtl8723bs/include/rtw_recv.h @@ -120,8 +120,8 @@ struct rx_raw_rssi u8 pwdball; s8 pwr_all; - u8 mimo_singal_strength[4];/* in 0~100 index */ - u8 mimo_singal_quality[4]; + u8 mimo_signal_strength[4];/* in 0~100 index */ + u8 mimo_signal_quality[4]; s8 ofdm_pwr[4]; u8 ofdm_snr[4]; @@ -302,7 +302,7 @@ struct recv_buf u32 ref_cnt; - struct adapter * adapter; + struct adapter *adapter; u8 *pbuf; u8 *pallocated_buf; diff --git a/drivers/staging/rtl8723bs/include/rtw_xmit.h b/drivers/staging/rtl8723bs/include/rtw_xmit.h index 37f42b2f22f1..ea1396005a13 100644 --- a/drivers/staging/rtl8723bs/include/rtw_xmit.h +++ b/drivers/staging/rtl8723bs/include/rtw_xmit.h @@ -83,7 +83,7 @@ do{\ #define TXDESC_OFFSET TXDESC_SIZE -enum TXDESC_SC{ +enum TXDESC_SC { SC_DONT_CARE = 0x00, SC_UPPER = 0x01, SC_LOWER = 0x02, diff --git a/drivers/staging/rtl8723bs/include/wifi.h b/drivers/staging/rtl8723bs/include/wifi.h index 559bf2606fb7..8c50bbb20f3b 100644 --- a/drivers/staging/rtl8723bs/include/wifi.h +++ b/drivers/staging/rtl8723bs/include/wifi.h @@ -266,8 +266,8 @@ enum WIFI_REG_DOMAIN { #define SetFrameType(pbuf, type) \ do { \ - *(unsigned short *)(pbuf) &= __constant_cpu_to_le16(~(BIT(3) | BIT(2))); \ - *(unsigned short *)(pbuf) |= __constant_cpu_to_le16(type); \ + *(unsigned short *)(pbuf) &= cpu_to_le16(~(BIT(3) | BIT(2))); \ + *(unsigned short *)(pbuf) |= cpu_to_le16(type); \ } while (0) #define GetFrameSubType(pbuf) (le16_to_cpu(*(__le16 *)(pbuf)) & (BIT(7) |\ @@ -374,18 +374,18 @@ __inline static unsigned char * get_da(unsigned char *pframe) unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe); switch (to_fr_ds) { - case 0x00: /* ToDs = 0, FromDs = 0 */ - da = GetAddr1Ptr(pframe); - break; - case 0x01: /* ToDs = 0, FromDs = 1 */ - da = GetAddr1Ptr(pframe); - break; - case 0x02: /* ToDs = 1, FromDs = 0 */ - da = GetAddr3Ptr(pframe); - break; - default: /* ToDs = 1, FromDs = 1 */ - da = GetAddr3Ptr(pframe); - break; + case 0x00: /* ToDs = 0, FromDs = 0 */ + da = GetAddr1Ptr(pframe); + break; + case 0x01: /* ToDs = 0, FromDs = 1 */ + da = GetAddr1Ptr(pframe); + break; + case 0x02: /* ToDs = 1, FromDs = 0 */ + da = GetAddr3Ptr(pframe); + break; + default: /* ToDs = 1, FromDs = 1 */ + da = GetAddr3Ptr(pframe); + break; } return da; @@ -398,18 +398,18 @@ __inline static unsigned char * get_sa(unsigned char *pframe) unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe); switch (to_fr_ds) { - case 0x00: /* ToDs = 0, FromDs = 0 */ - sa = GetAddr2Ptr(pframe); - break; - case 0x01: /* ToDs = 0, FromDs = 1 */ - sa = GetAddr3Ptr(pframe); - break; - case 0x02: /* ToDs = 1, FromDs = 0 */ - sa = GetAddr2Ptr(pframe); - break; - default: /* ToDs = 1, FromDs = 1 */ - sa = GetAddr4Ptr(pframe); - break; + case 0x00: /* ToDs = 0, FromDs = 0 */ + sa = GetAddr2Ptr(pframe); + break; + case 0x01: /* ToDs = 0, FromDs = 1 */ + sa = GetAddr3Ptr(pframe); + break; + case 0x02: /* ToDs = 1, FromDs = 0 */ + sa = GetAddr2Ptr(pframe); + break; + default: /* ToDs = 1, FromDs = 1 */ + sa = GetAddr4Ptr(pframe); + break; } return sa; @@ -421,18 +421,18 @@ __inline static unsigned char * get_hdr_bssid(unsigned char *pframe) unsigned int to_fr_ds = (GetToDs(pframe) << 1) | GetFrDs(pframe); switch (to_fr_ds) { - case 0x00: /* ToDs = 0, FromDs = 0 */ - sa = GetAddr3Ptr(pframe); - break; - case 0x01: /* ToDs = 0, FromDs = 1 */ - sa = GetAddr2Ptr(pframe); - break; - case 0x02: /* ToDs = 1, FromDs = 0 */ - sa = GetAddr1Ptr(pframe); - break; - case 0x03: /* ToDs = 1, FromDs = 1 */ - sa = GetAddr1Ptr(pframe); - break; + case 0x00: /* ToDs = 0, FromDs = 0 */ + sa = GetAddr3Ptr(pframe); + break; + case 0x01: /* ToDs = 0, FromDs = 1 */ + sa = GetAddr2Ptr(pframe); + break; + case 0x02: /* ToDs = 1, FromDs = 0 */ + sa = GetAddr1Ptr(pframe); + break; + case 0x03: /* ToDs = 1, FromDs = 1 */ + sa = GetAddr1Ptr(pframe); + break; } return sa; @@ -1070,9 +1070,9 @@ enum P2P_STATE { P2P_STATE_TX_PROVISION_DIS_REQ = 6, /* In P2P provisioning discovery */ P2P_STATE_RX_PROVISION_DIS_RSP = 7, P2P_STATE_RX_PROVISION_DIS_REQ = 8, - P2P_STATE_GONEGO_ING = 9, /* Doing the group owner negoitation handshake */ - P2P_STATE_GONEGO_OK = 10, /* finish the group negoitation handshake with success */ - P2P_STATE_GONEGO_FAIL = 11, /* finish the group negoitation handshake with failure */ + P2P_STATE_GONEGO_ING = 9, /* Doing the group owner negotiation handshake */ + P2P_STATE_GONEGO_OK = 10, /* finish the group negotiation handshake with success */ + P2P_STATE_GONEGO_FAIL = 11, /* finish the group negotiation handshake with failure */ P2P_STATE_RECV_INVITE_REQ_MATCH = 12, /* receiving the P2P Invitation request and match with the profile. */ P2P_STATE_PROVISIONING_ING = 13, /* Doing the P2P WPS */ P2P_STATE_PROVISIONING_DONE = 14, /* Finish the P2P WPS */ @@ -1082,8 +1082,8 @@ enum P2P_STATE { P2P_STATE_RECV_INVITE_REQ_GO = 18, /* receiving the P2P Invitation request and this wifi is GO. */ P2P_STATE_RECV_INVITE_REQ_JOIN = 19, /* receiving the P2P Invitation request to join an existing P2P Group. */ P2P_STATE_RX_INVITE_RESP_FAIL = 20, /* recveing the P2P Invitation response with failure */ - P2P_STATE_RX_INFOR_NOREADY = 21, /* receiving p2p negoitation response with information is not available */ - P2P_STATE_TX_INFOR_NOREADY = 22, /* sending p2p negoitation response with information is not available */ + P2P_STATE_RX_INFOR_NOREADY = 21, /* receiving p2p negotiation response with information is not available */ + P2P_STATE_TX_INFOR_NOREADY = 22, /* sending p2p negotiation response with information is not available */ }; enum P2P_WPSINFO { diff --git a/drivers/staging/rtl8723bs/include/wlan_bssdef.h b/drivers/staging/rtl8723bs/include/wlan_bssdef.h index bdb14a84e5a5..88890b1c3c4c 100644 --- a/drivers/staging/rtl8723bs/include/wlan_bssdef.h +++ b/drivers/staging/rtl8723bs/include/wlan_bssdef.h @@ -129,15 +129,15 @@ struct ndis_801_11_ai_resfi { typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION { - u32 Length; - u16 AvailableRequestFixedIEs; - struct ndis_802_11_ai_reqfi RequestFixedIEs; - u32 RequestIELength; - u32 OffsetRequestIEs; - u16 AvailableResponseFixedIEs; - struct ndis_801_11_ai_resfi ResponseFixedIEs; - u32 ResponseIELength; - u32 OffsetResponseIEs; + u32 Length; + u16 AvailableRequestFixedIEs; + struct ndis_802_11_ai_reqfi RequestFixedIEs; + u32 RequestIELength; + u32 OffsetRequestIEs; + u16 AvailableResponseFixedIEs; + struct ndis_801_11_ai_resfi ResponseFixedIEs; + u32 ResponseIELength; + u32 OffsetResponseIEs; } NDIS_802_11_ASSOCIATION_INFORMATION, *PNDIS_802_11_ASSOCIATION_INFORMATION; enum NDIS_802_11_RELOAD_DEFAULTS { @@ -148,19 +148,19 @@ enum NDIS_802_11_RELOAD_DEFAULTS { /* Key mapping keys require a BSSID */ typedef struct _NDIS_802_11_KEY { - u32 Length; /* Length of this structure */ - u32 KeyIndex; - u32 KeyLength; /* length of key in bytes */ - NDIS_802_11_MAC_ADDRESS BSSID; - unsigned long long KeyRSC; - u8 KeyMaterial[32]; /* variable length depending on above field */ + u32 Length; /* Length of this structure */ + u32 KeyIndex; + u32 KeyLength; /* length of key in bytes */ + NDIS_802_11_MAC_ADDRESS BSSID; + unsigned long long KeyRSC; + u8 KeyMaterial[32]; /* variable length depending on above field */ } NDIS_802_11_KEY, *PNDIS_802_11_KEY; typedef struct _NDIS_802_11_REMOVE_KEY { - u32 Length; /* Length of this structure */ - u32 KeyIndex; - NDIS_802_11_MAC_ADDRESS BSSID; + u32 Length; /* Length of this structure */ + u32 KeyIndex; + NDIS_802_11_MAC_ADDRESS BSSID; } NDIS_802_11_REMOVE_KEY, *PNDIS_802_11_REMOVE_KEY; struct ndis_802_11_wep { @@ -181,7 +181,7 @@ struct ndis_802_11_wep { #define MIC_CHECK_TIME 60000000 #ifndef Ndis802_11APMode -#define Ndis802_11APMode (Ndis802_11InfrastructureMax+1) +#define Ndis802_11APMode (Ndis802_11InfrastructureMax + 1) #endif struct wlan_phy_info { @@ -240,15 +240,15 @@ struct wlan_network { }; 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 @@ -259,9 +259,9 @@ enum VCS_TYPE { enum UAPSD_MAX_SP { NO_LIMIT, - TWO_MSDU, - FOUR_MSDU, - SIX_MSDU + TWO_MSDU, + FOUR_MSDU, + SIX_MSDU }; #define NUM_PRE_AUTH_KEY 16 |