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