|
 |
deb259 |
From 7d0e51654368bcd06c4945beee388012001bad6e Mon Sep 17 00:00:00 2001
|
|
|
deb259 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
deb259 |
Date: Thu, 5 Sep 2019 18:48:58 +0200
|
|
|
deb259 |
Subject: [PATCH 31/43] Revert "iwlwifi: mvm: properly decode HE GI duration"
|
|
|
deb259 |
|
|
|
deb259 |
This reverts commit 93cc712a7993194c5682978d46f859b8d288ed53.
|
|
|
deb259 |
---
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 22 ++++++----------------
|
|
|
deb259 |
1 file changed, 6 insertions(+), 16 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.550291373 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c 2019-09-06 01:25:45.716289255 +0200
|
|
|
deb259 |
@@ -1197,35 +1197,25 @@
|
|
|
deb259 |
switch ((rate_n_flags & RATE_MCS_HE_GI_LTF_MSK) >>
|
|
|
deb259 |
RATE_MCS_HE_GI_LTF_POS) {
|
|
|
deb259 |
case 0:
|
|
|
deb259 |
- if (he_type == RATE_MCS_HE_TYPE_TRIG)
|
|
|
deb259 |
- rx_status->he_gi = NL80211_RATE_INFO_HE_GI_1_6;
|
|
|
deb259 |
- else
|
|
|
deb259 |
- rx_status->he_gi = NL80211_RATE_INFO_HE_GI_0_8;
|
|
|
deb259 |
+ rx_status->he_gi = NL80211_RATE_INFO_HE_GI_0_8;
|
|
|
deb259 |
if (he_type == RATE_MCS_HE_TYPE_MU)
|
|
|
deb259 |
ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X;
|
|
|
deb259 |
else
|
|
|
deb259 |
ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_1X;
|
|
|
deb259 |
break;
|
|
|
deb259 |
case 1:
|
|
|
deb259 |
- if (he_type == RATE_MCS_HE_TYPE_TRIG)
|
|
|
deb259 |
- rx_status->he_gi = NL80211_RATE_INFO_HE_GI_1_6;
|
|
|
deb259 |
- else
|
|
|
deb259 |
- rx_status->he_gi = NL80211_RATE_INFO_HE_GI_0_8;
|
|
|
deb259 |
+ rx_status->he_gi = NL80211_RATE_INFO_HE_GI_0_8;
|
|
|
deb259 |
ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_2X;
|
|
|
deb259 |
break;
|
|
|
deb259 |
case 2:
|
|
|
deb259 |
- if (he_type == RATE_MCS_HE_TYPE_TRIG) {
|
|
|
deb259 |
- rx_status->he_gi = NL80211_RATE_INFO_HE_GI_3_2;
|
|
|
deb259 |
+ rx_status->he_gi = NL80211_RATE_INFO_HE_GI_1_6;
|
|
|
deb259 |
+ if (he_type == RATE_MCS_HE_TYPE_TRIG)
|
|
|
deb259 |
ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X;
|
|
|
deb259 |
- } else {
|
|
|
deb259 |
- rx_status->he_gi = NL80211_RATE_INFO_HE_GI_1_6;
|
|
|
deb259 |
+ else
|
|
|
deb259 |
ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_2X;
|
|
|
deb259 |
- }
|
|
|
deb259 |
break;
|
|
|
deb259 |
case 3:
|
|
|
deb259 |
- if ((he_type == RATE_MCS_HE_TYPE_SU ||
|
|
|
deb259 |
- he_type == RATE_MCS_HE_TYPE_EXT_SU) &&
|
|
|
deb259 |
- rate_n_flags & RATE_MCS_SGI_MSK)
|
|
|
deb259 |
+ if (rate_n_flags & RATE_MCS_SGI_MSK)
|
|
|
deb259 |
rx_status->he_gi = NL80211_RATE_INFO_HE_GI_0_8;
|
|
|
deb259 |
else
|
|
|
deb259 |
rx_status->he_gi = NL80211_RATE_INFO_HE_GI_3_2;
|