You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
59 lines
2.0 KiB
59 lines
2.0 KiB
From 9e4d7a8c370f44f61540b26d5f76b916f791872d Mon Sep 17 00:00:00 2001
|
|
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
Date: Thu, 5 Sep 2019 18:49:04 +0200
|
|
Subject: [PATCH 32/43] Revert "iwlwifi: mvm: put LTF symbol size into HE
|
|
radiotap"
|
|
|
|
This reverts commit de8da23060843b07ad291ad3bdea173b58d86a3d.
|
|
---
|
|
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 14 +-------------
|
|
1 file changed, 1 insertion(+), 13 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.716289255 +0200
|
|
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c 2019-09-06 01:25:45.881287151 +0200
|
|
@@ -972,7 +972,7 @@
|
|
struct ieee80211_radiotap_he *he = NULL;
|
|
struct ieee80211_radiotap_he_mu *he_mu = NULL;
|
|
u32 he_type = 0xffffffff;
|
|
- u8 stbc, ltf;
|
|
+ u8 stbc;
|
|
|
|
static const struct ieee80211_radiotap_he known = {
|
|
.data1 = cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_DATA_MCS_KNOWN |
|
|
@@ -1198,33 +1198,21 @@
|
|
RATE_MCS_HE_GI_LTF_POS) {
|
|
case 0:
|
|
rx_status->he_gi = NL80211_RATE_INFO_HE_GI_0_8;
|
|
- if (he_type == RATE_MCS_HE_TYPE_MU)
|
|
- ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X;
|
|
- else
|
|
- ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_1X;
|
|
break;
|
|
case 1:
|
|
rx_status->he_gi = NL80211_RATE_INFO_HE_GI_0_8;
|
|
- ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_2X;
|
|
break;
|
|
case 2:
|
|
rx_status->he_gi = NL80211_RATE_INFO_HE_GI_1_6;
|
|
- if (he_type == RATE_MCS_HE_TYPE_TRIG)
|
|
- ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X;
|
|
- else
|
|
- ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_2X;
|
|
break;
|
|
case 3:
|
|
if (rate_n_flags & RATE_MCS_SGI_MSK)
|
|
rx_status->he_gi = NL80211_RATE_INFO_HE_GI_0_8;
|
|
else
|
|
rx_status->he_gi = NL80211_RATE_INFO_HE_GI_3_2;
|
|
- ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X;
|
|
break;
|
|
}
|
|
|
|
- he->data5 |= le16_encode_bits(ltf, IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE);
|
|
-
|
|
switch (he_type) {
|
|
case RATE_MCS_HE_TYPE_SU: {
|
|
u16 val;
|