1 files changed, 21 insertions, 2 deletions

diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index ac799a046eb7..553adfb0aa81 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -295,6 +295,13 @@ struct mwifiex_bssdescriptor {
         u16 bss_co_2040_offset;
         u8 *bcn_ext_cap;
         u16 ext_cap_offset;
+        struct ieee80211_vht_cap *bcn_vht_cap;
+        u16 vht_cap_offset;
+        struct ieee80211_vht_operation *bcn_vht_oper;
+        u16 vht_info_offset;
+        struct ieee_types_oper_mode_ntf *oper_mode;
+        u16 oper_mode_offset;
+        u8 disable_11ac;
         struct ieee_types_vendor_specific *bcn_wpa_ie;
         u16 wpa_offset;
         struct ieee_types_generic *bcn_rsn_ie;
@@ -499,6 +506,7 @@ struct mwifiex_private {
         u16 rsn_idx;
         struct timer_list scan_delay_timer;
         u8 ap_11n_enabled;
+        u8 ap_11ac_enabled;
         u32 mgmt_frame_mask;
         struct mwifiex_roc_cfg roc_cfg;
 };
@@ -722,6 +730,15 @@ struct mwifiex_adapter {
         u16 max_mgmt_ie_index;
         u8 scan_delay_cnt;
         u8 empty_tx_q_cnt;
+
+        /* 11AC */
+        u32 is_hw_11ac_capable;
+        u32 hw_dot_11ac_dev_cap;
+        u32 hw_dot_11ac_mcs_support;
+        u32 usr_dot_11ac_dev_cap_bg;
+        u32 usr_dot_11ac_dev_cap_a;
+        u32 usr_dot_11ac_mcs_support;
+
         atomic_t is_tx_received;
         atomic_t pending_bridged_pkts;
 };
@@ -864,8 +881,10 @@ int mwifiex_ret_802_11_ad_hoc(struct mwifiex_private *priv,
 int mwifiex_cmd_802_11_bg_scan_query(struct host_cmd_ds_command *cmd);
 struct mwifiex_chan_freq_power *mwifiex_get_cfp(struct mwifiex_private *priv,
                                                 u8 band, u16 channel, u32 freq);
-u32 mwifiex_index_to_data_rate(struct mwifiex_private *priv, u8 index,
-                                                        u8 ht_info);
+u32 mwifiex_index_to_data_rate(struct mwifiex_private *priv,
+                               u8 index, u8 ht_info);
+u32 mwifiex_index_to_acs_data_rate(struct mwifiex_private *priv,
+                                   u8 index, u8 ht_info);
 u32 mwifiex_find_freq_from_band_chan(u8, u8);
 int mwifiex_cmd_append_vsie_tlv(struct mwifiex_private *priv, u16 vsie_mask,
                                 u8 **buffer);