From 7f696e8cbeeb5bafe6de1534d9882cf696e8e937 Mon Sep 17 00:00:00 2001 From: Eugene Syromiatnikov Date: Thu, 5 Sep 2019 18:48:00 +0200 Subject: [PATCH 29/43] Revert "iwlwifi: mvm: remove channel 2 from HE radiotap if not applicable" This reverts commit 317bc55fa82fbb7f1fe20170e50e0553af1bd69c. --- drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) Index: src/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c =================================================================== --- src.orig/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c 2019-09-06 01:25:45.197295875 +0200 +++ src/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c 2019-09-06 01:25:45.376293592 +0200 @@ -905,7 +905,6 @@ static void iwl_mvm_decode_he_sigb(struct iwl_mvm *mvm, struct iwl_rx_mpdu_desc *desc, - u32 rate_n_flags, struct ieee80211_radiotap_he_mu *he_mu) { u32 sigb0, sigb1; @@ -941,8 +940,7 @@ sigb1); } - if (FIELD_GET(IWL_RX_HE_SIGB_COMMON2_CH2_CRC_OK, sigb2) && - (rate_n_flags & RATE_MCS_CHAN_WIDTH_MSK) != RATE_MCS_CHAN_WIDTH_20) { + if (FIELD_GET(IWL_RX_HE_SIGB_COMMON2_CH2_CRC_OK, sigb2)) { he_mu->flags1 |= cpu_to_le16(IEEE80211_RADIOTAP_HE_MU_FLAGS1_CH2_RU_KNOWN | IEEE80211_RADIOTAP_HE_MU_FLAGS1_CH2_CTR_26T_RU_KNOWN); @@ -1059,7 +1057,7 @@ he_phy_data) == IWL_RX_HE_PHY_INFO_TYPE_MU_EXT_INFO; if (sigb_data) - iwl_mvm_decode_he_sigb(mvm, desc, rate_n_flags, he_mu); + iwl_mvm_decode_he_sigb(mvm, desc, he_mu); } if (he_phy_data != HE_PHY_DATA_INVAL && (he_type == RATE_MCS_HE_TYPE_SU ||