|
 |
deb259 |
From 7178e4273a222597d37155c0070e3e3530433f91 Mon Sep 17 00:00:00 2001
|
|
|
deb259 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
deb259 |
Date: Thu, 5 Sep 2019 18:19:35 +0200
|
|
|
deb259 |
Subject: [PATCH 11/43] Revert "iwlwifi: mvm: add HE TB PPDU SIG-A BW to
|
|
|
deb259 |
radiotap"
|
|
|
deb259 |
|
|
|
deb259 |
This reverts commit 74cf15cb69c0beb6cdaae3ff43f5231232a1f1b0.
|
|
|
deb259 |
---
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 21 ++++++---------------
|
|
|
deb259 |
1 file changed, 6 insertions(+), 15 deletions(-)
|
|
|
deb259 |
|
|
|
deb259 |
Index: src/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
|
|
|
deb259 |
===================================================================
|
|
|
deb259 |
--- src.orig/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c 2019-09-06 01:25:42.203334065 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c 2019-09-06 01:25:42.372331909 +0200
|
|
|
deb259 |
@@ -976,7 +976,6 @@
|
|
|
deb259 |
* the TSF/timers are not be transmitted in HE-MU.
|
|
|
deb259 |
*/
|
|
|
deb259 |
u8 ru = le32_get_bits(phy_data->d1, IWL_RX_PHY_DATA1_HE_RU_ALLOC_MASK);
|
|
|
deb259 |
- u32 he_type = rate_n_flags & RATE_MCS_HE_TYPE_MSK;
|
|
|
deb259 |
u8 offs = 0;
|
|
|
deb259 |
|
|
|
deb259 |
rx_status->bw = RATE_INFO_BW_HE_RU;
|
|
|
deb259 |
@@ -1019,27 +1018,19 @@
|
|
|
deb259 |
he->data2 |=
|
|
|
deb259 |
cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA2_PRISEC_80_SEC);
|
|
|
deb259 |
|
|
|
deb259 |
+ if (he_mu) {
|
|
|
deb259 |
#define CHECK_BW(bw) \
|
|
|
deb259 |
BUILD_BUG_ON(IEEE80211_RADIOTAP_HE_MU_FLAGS2_BW_FROM_SIG_A_BW_ ## bw ## MHZ != \
|
|
|
deb259 |
- RATE_MCS_CHAN_WIDTH_##bw >> RATE_MCS_CHAN_WIDTH_POS); \
|
|
|
deb259 |
- BUILD_BUG_ON(IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_ ## bw ## MHZ != \
|
|
|
deb259 |
RATE_MCS_CHAN_WIDTH_##bw >> RATE_MCS_CHAN_WIDTH_POS)
|
|
|
deb259 |
- CHECK_BW(20);
|
|
|
deb259 |
- CHECK_BW(40);
|
|
|
deb259 |
- CHECK_BW(80);
|
|
|
deb259 |
- CHECK_BW(160);
|
|
|
deb259 |
-
|
|
|
deb259 |
- if (he_mu)
|
|
|
deb259 |
+ CHECK_BW(20);
|
|
|
deb259 |
+ CHECK_BW(40);
|
|
|
deb259 |
+ CHECK_BW(80);
|
|
|
deb259 |
+ CHECK_BW(160);
|
|
|
deb259 |
he_mu->flags2 |=
|
|
|
deb259 |
le16_encode_bits(FIELD_GET(RATE_MCS_CHAN_WIDTH_MSK,
|
|
|
deb259 |
rate_n_flags),
|
|
|
deb259 |
IEEE80211_RADIOTAP_HE_MU_FLAGS2_BW_FROM_SIG_A_BW);
|
|
|
deb259 |
- else if (he_type == RATE_MCS_HE_TYPE_TRIG)
|
|
|
deb259 |
- he->data6 |=
|
|
|
deb259 |
- cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_KNOWN) |
|
|
|
deb259 |
- le16_encode_bits(FIELD_GET(RATE_MCS_CHAN_WIDTH_MSK,
|
|
|
deb259 |
- rate_n_flags),
|
|
|
deb259 |
- IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW);
|
|
|
deb259 |
+ }
|
|
|
deb259 |
}
|
|
|
deb259 |
|
|
|
deb259 |
static void iwl_mvm_decode_he_phy_data(struct iwl_mvm *mvm,
|