Update rtl8812au driver

[android-x86/external-kernel-drivers.git] / rtl8812au / include / wifi.h

diff --git a/rtl8812au/include/wifi.h b/rtl8812au/include/wifi.h
index 588ef93..ead7f88 100644 (file)
--- a/rtl8812au/include/wifi.h
+++ b/rtl8812au/include/wifi.h
@@ -726,7 +726,6 @@ typedef     enum _ELEMENT_ID {
  * This structure refers to "HT BlockAckReq" as
  * described in 802.11n draft section 7.2.1.7.1
  */
-#if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8712FW)
 struct rtw_ieee80211_bar {
        __le16 frame_control;
        __le16 duration;
@@ -735,17 +734,11 @@ struct rtw_ieee80211_bar {
        __le16 control;
        __le16 start_seq_num;
 } __attribute__((packed));
-#endif
 
 /* 802.11 BAR control masks */
 #define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL     0x0000
 #define IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA  0x0004
 
-
-#if defined(PLATFORM_LINUX) || defined(CONFIG_RTL8712FW) || defined(PLATFORM_FREEBSD)
-
-
-
 /**
 * struct rtw_ieee80211_ht_cap - HT capabilities
 *
@@ -776,7 +769,6 @@ struct ieee80211_ht_addt_info {
        unsigned char           basic_set[16];
 } __attribute__((packed));
 
-
 struct HT_caps_element {
        union {
                struct {
@@ -816,77 +808,6 @@ struct ADDBA_request {
        __le16  BA_starting_seqctrl;
 }  __attribute__((packed));
 
-
-
-#endif
-
-
-#ifdef PLATFORM_WINDOWS
-
-#pragma pack(1)
-
-struct rtw_ieee80211_ht_cap {
-       unsigned short  cap_info;
-       unsigned char   ampdu_params_info;
-       unsigned char   supp_mcs_set[16];
-       unsigned short  extended_ht_cap_info;
-       unsigned int            tx_BF_cap_info;
-       unsigned char          antenna_selection_info;
-};
-
-
-struct ieee80211_ht_addt_info {
-       unsigned char   control_chan;
-       unsigned char           ht_param;
-       unsigned short  operation_mode;
-       unsigned short  stbc_param;
-       unsigned char           basic_set[16];
-};
-
-struct HT_caps_element {
-       union {
-               struct {
-                       unsigned short  HT_caps_info;
-                       unsigned char   AMPDU_para;
-                       unsigned char   MCS_rate[16];
-                       unsigned short  HT_ext_caps;
-                       unsigned int    Beamforming_caps;
-                       unsigned char   ASEL_caps;
-               } HT_cap_element;
-               unsigned char HT_cap[26];
-       };
-};
-
-struct HT_info_element {
-       unsigned char   primary_channel;
-       unsigned char   infos[5];
-       unsigned char   MCS_rate[16];
-};
-
-struct AC_param {
-       unsigned char           ACI_AIFSN;
-       unsigned char           CW;
-       unsigned short  TXOP_limit;
-};
-
-struct WMM_para_element {
-       unsigned char           QoS_info;
-       unsigned char           reserved;
-       struct AC_param ac_param[4];
-};
-
-struct ADDBA_request {
-       unsigned char           dialog_token;
-       unsigned short  BA_para_set;
-       unsigned short  BA_timeout_value;
-       unsigned short  BA_starting_seqctrl;
-};
-
-
-#pragma pack()
-
-#endif
-
 typedef enum _HT_CAP_AMPDU_FACTOR {
        MAX_AMPDU_FACTOR_8K             = 0,
        MAX_AMPDU_FACTOR_16K    = 1,