|
 |
deb259 |
From 9e4d7a8c370f44f61540b26d5f76b916f791872d Mon Sep 17 00:00:00 2001
|
|
|
deb259 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
deb259 |
Date: Thu, 5 Sep 2019 18:49:04 +0200
|
|
|
deb259 |
Subject: [PATCH 32/43] Revert "iwlwifi: mvm: put LTF symbol size into HE
|
|
|
deb259 |
radiotap"
|
|
|
deb259 |
|
|
|
deb259 |
This reverts commit de8da23060843b07ad291ad3bdea173b58d86a3d.
|
|
|
deb259 |
---
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 14 +-------------
|
|
|
deb259 |
1 file changed, 1 insertion(+), 13 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.716289255 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c 2019-09-06 01:25:45.881287151 +0200
|
|
|
deb259 |
@@ -972,7 +972,7 @@
|
|
|
deb259 |
struct ieee80211_radiotap_he *he = NULL;
|
|
|
deb259 |
struct ieee80211_radiotap_he_mu *he_mu = NULL;
|
|
|
deb259 |
u32 he_type = 0xffffffff;
|
|
|
deb259 |
- u8 stbc, ltf;
|
|
|
deb259 |
+ u8 stbc;
|
|
|
deb259 |
|
|
|
deb259 |
static const struct ieee80211_radiotap_he known = {
|
|
|
deb259 |
.data1 = cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_DATA_MCS_KNOWN |
|
|
|
deb259 |
@@ -1198,33 +1198,21 @@
|
|
|
deb259 |
RATE_MCS_HE_GI_LTF_POS) {
|
|
|
deb259 |
case 0:
|
|
|
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 |
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 |
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 |
- ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_2X;
|
|
|
deb259 |
break;
|
|
|
deb259 |
case 3:
|
|
|
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;
|
|
|
deb259 |
- ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X;
|
|
|
deb259 |
break;
|
|
|
deb259 |
}
|
|
|
deb259 |
|
|
|
deb259 |
- he->data5 |= le16_encode_bits(ltf, IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE);
|
|
|
deb259 |
-
|
|
|
deb259 |
switch (he_type) {
|
|
|
deb259 |
case RATE_MCS_HE_TYPE_SU: {
|
|
|
deb259 |
u16 val;
|