1 files changed, 55 insertions, 9 deletions

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 851a5e19ae32..5790f55c241d 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -23,6 +23,7 @@
 #include <linux/ieee80211.h>
 #include <net/cfg80211.h>
 #include <net/codel.h>
+#include <net/ieee80211_radiotap.h>
 #include <asm/unaligned.h>
 
 /**
@@ -162,6 +163,8 @@ enum ieee80211_ac_numbers {
  * @txop: maximum burst time in units of 32 usecs, 0 meaning disabled
  * @acm: is mandatory admission control required for the access category
  * @uapsd: is U-APSD mode enabled for the queue
+ * @mu_edca: is the MU EDCA configured
+ * @mu_edca_param_rec: MU EDCA Parameter Record for HE
  */
 struct ieee80211_tx_queue_params {
         u16 txop;
@@ -170,6 +173,8 @@ struct ieee80211_tx_queue_params {
         u8 aifs;
         bool acm;
         bool uapsd;
+        bool mu_edca;
+        struct ieee80211_he_mu_edca_param_ac_rec mu_edca_param_rec;
 };
 
 struct ieee80211_low_level_stats {
@@ -463,6 +468,15 @@ struct ieee80211_mu_group_data {
  * This structure keeps information about a BSS (and an association
  * to that BSS) that can change during the lifetime of the BSS.
  *
+ * @bss_color: 6-bit value to mark inter-BSS frame, if BSS supports HE
+ * @htc_trig_based_pkt_ext: default PE in 4us units, if BSS supports HE
+ * @multi_sta_back_32bit: supports BA bitmap of 32-bits in Multi-STA BACK
+ * @uora_exists: is the UORA element advertised by AP
+ * @ack_enabled: indicates support to receive a multi-TID that solicits either
+ *      ACK, BACK or both
+ * @uora_ocw_range: UORA element's OCW Range field
+ * @frame_time_rts_th: HE duration RTS threshold, in units of 32us
+ * @he_support: does this BSS support HE
  * @assoc: association status
  * @ibss_joined: indicates whether this station is part of an IBSS
  *      or not
@@ -550,6 +564,14 @@ struct ieee80211_mu_group_data {
  */
 struct ieee80211_bss_conf {
         const u8 *bssid;
+        u8 bss_color;
+        u8 htc_trig_based_pkt_ext;
+        bool multi_sta_back_32bit;
+        bool uora_exists;
+        bool ack_enabled;
+        u8 uora_ocw_range;
+        u16 frame_time_rts_th;
+        bool he_support;
         /* association related data */
         bool assoc, ibss_joined;
         bool ibss_creator;
@@ -1106,6 +1128,18 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
  * @RX_FLAG_AMPDU_EOF_BIT: Value of the EOF bit in the A-MPDU delimiter for this
  *      frame
  * @RX_FLAG_AMPDU_EOF_BIT_KNOWN: The EOF value is known
+ * @RX_FLAG_RADIOTAP_HE: HE radiotap data is present
+ *      (&struct ieee80211_radiotap_he, mac80211 will fill in
+ *       - DATA3_DATA_MCS
+ *       - DATA3_DATA_DCM
+ *       - DATA3_CODING
+ *       - DATA5_GI
+ *       - DATA5_DATA_BW_RU_ALLOC
+ *       - DATA6_NSTS
+ *       - DATA3_STBC
+ *      from the RX info data, so leave those zeroed when building this data)
+ * @RX_FLAG_RADIOTAP_HE_MU: HE MU radiotap data is present
+ *      (&struct ieee80211_radiotap_he_mu)
  */
 enum mac80211_rx_flags {
         RX_FLAG_MMIC_ERROR              = BIT(0),
@@ -1134,6 +1168,8 @@ enum mac80211_rx_flags {
         RX_FLAG_ICV_STRIPPED            = BIT(23),
         RX_FLAG_AMPDU_EOF_BIT           = BIT(24),
         RX_FLAG_AMPDU_EOF_BIT_KNOWN     = BIT(25),
+        RX_FLAG_RADIOTAP_HE             = BIT(26),
+        RX_FLAG_RADIOTAP_HE_MU          = BIT(27),
 };
 
 /**
@@ -1164,6 +1200,7 @@ enum mac80211_rx_encoding {
         RX_ENC_LEGACY = 0,
         RX_ENC_HT,
         RX_ENC_VHT,
+        RX_ENC_HE,
 };
 
 /**
@@ -1198,6 +1235,9 @@ enum mac80211_rx_encoding {
  * @encoding: &enum mac80211_rx_encoding
  * @bw: &enum rate_info_bw
  * @enc_flags: uses bits from &enum mac80211_rx_encoding_flags
+ * @he_ru: HE RU, from &enum nl80211_he_ru_alloc
+ * @he_gi: HE GI, from &enum nl80211_he_gi
+ * @he_dcm: HE DCM value
  * @rx_flags: internal RX flags for mac80211
  * @ampdu_reference: A-MPDU reference number, must be a different value for
  *      each A-MPDU but the same for each subframe within one A-MPDU
@@ -1211,7 +1251,8 @@ struct ieee80211_rx_status {
         u32 flag;
         u16 freq;
         u8 enc_flags;
-        u8 encoding:2, bw:3;
+        u8 encoding:2, bw:3, he_ru:3;
+        u8 he_gi:2, he_dcm:1;
         u8 rate_idx;
         u8 nss;
         u8 rx_flags;
@@ -1770,6 +1811,7 @@ struct ieee80211_sta_rates {
  * @supp_rates: Bitmap of supported rates (per band)
  * @ht_cap: HT capabilities of this STA; restricted to our own capabilities
  * @vht_cap: VHT capabilities of this STA; restricted to our own capabilities
+ * @he_cap: HE capabilities of this STA
  * @max_rx_aggregation_subframes: maximal amount of frames in a single AMPDU
  *      that this station is allowed to transmit to us.
  *      Can be modified by driver.
@@ -1805,7 +1847,8 @@ struct ieee80211_sta {
         u16 aid;
         struct ieee80211_sta_ht_cap ht_cap;
         struct ieee80211_sta_vht_cap vht_cap;
-        u8 max_rx_aggregation_subframes;
+        struct ieee80211_sta_he_cap he_cap;
+        u16 max_rx_aggregation_subframes;
         bool wme;
         u8 uapsd_queues;
         u8 max_sp;
@@ -2196,10 +2239,11 @@ enum ieee80211_hw_flags {
  *      it shouldn't be set.
  *
  * @max_tx_aggregation_subframes: maximum number of subframes in an
- *      aggregate an HT driver will transmit. Though ADDBA will advertise
- *      a constant value of 64 as some older APs can crash if the window
- *      size is smaller (an example is LinkSys WRT120N with FW v1.0.07
- *      build 002 Jun 18 2012).
+ *      aggregate an HT/HE device will transmit. In HT AddBA we'll
+ *      advertise a constant value of 64 as some older APs crash if
+ *      the window size is smaller (an example is LinkSys WRT120N
+ *      with FW v1.0.07 build 002 Jun 18 2012).
+ *      For AddBA to HE capable peers this value will be used.
  *
  * @max_tx_fragments: maximum number of tx buffers per (A)-MSDU, sum
  *      of 1 + skb_shinfo(skb)->nr_frags for each skb in the frag_list.
@@ -2216,6 +2260,8 @@ enum ieee80211_hw_flags {
  *      the default is _GI | _BANDWIDTH.
  *      Use the %IEEE80211_RADIOTAP_VHT_KNOWN_\* values.
  *
+ * @radiotap_he: HE radiotap validity flags
+ *
  * @radiotap_timestamp: Information for the radiotap timestamp field; if the
  *      'units_pos' member is set to a non-negative value it must be set to
  *      a combination of a IEEE80211_RADIOTAP_TIMESTAMP_UNIT_* and a
@@ -2263,8 +2309,8 @@ struct ieee80211_hw {
         u8 max_rates;
         u8 max_report_rates;
         u8 max_rate_tries;
-        u8 max_rx_aggregation_subframes;
-        u8 max_tx_aggregation_subframes;
+        u16 max_rx_aggregation_subframes;
+        u16 max_tx_aggregation_subframes;
         u8 max_tx_fragments;
         u8 offchannel_tx_hw_queue;
         u8 radiotap_mcs_details;
@@ -2904,7 +2950,7 @@ struct ieee80211_ampdu_params {
         struct ieee80211_sta *sta;
         u16 tid;
         u16 ssn;
-        u8 buf_size;
+        u16 buf_size;
         bool amsdu;
         u16 timeout;
 };