|
 |
deb259 |
From 4f2b4c2c38836f9a20ac16ad0ddc8f273b1997a6 Mon Sep 17 00:00:00 2001
|
|
|
deb259 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
deb259 |
Date: Thu, 5 Sep 2019 18:47:02 +0200
|
|
|
deb259 |
Subject: [PATCH 25/43] Revert "iwlwifi: mvm: minor cleanups to HE radiotap
|
|
|
deb259 |
code"
|
|
|
deb259 |
|
|
|
deb259 |
This reverts commit f9fe579386a84878eea9217c8e825a7d11335feb.
|
|
|
deb259 |
---
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 11 ++++++++---
|
|
|
deb259 |
1 file changed, 8 insertions(+), 3 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:44.531304371 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c 2019-09-06 01:25:44.696302266 +0200
|
|
|
deb259 |
@@ -973,8 +973,9 @@
|
|
|
deb259 |
u64 he_phy_data = HE_PHY_DATA_INVAL;
|
|
|
deb259 |
struct ieee80211_radiotap_he *he = NULL;
|
|
|
deb259 |
struct ieee80211_radiotap_he_mu *he_mu = NULL;
|
|
|
deb259 |
- u32 he_type = rate_n_flags & RATE_MCS_HE_TYPE_MSK;
|
|
|
deb259 |
+ u32 he_type = 0xffffffff;
|
|
|
deb259 |
u8 stbc, ltf;
|
|
|
deb259 |
+
|
|
|
deb259 |
static const struct ieee80211_radiotap_he known = {
|
|
|
deb259 |
.data1 = cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_DATA_MCS_KNOWN |
|
|
|
deb259 |
IEEE80211_RADIOTAP_HE_DATA1_DATA_DCM_KNOWN |
|
|
|
deb259 |
@@ -998,14 +999,18 @@
|
|
|
deb259 |
radiotap_len += sizeof(known);
|
|
|
deb259 |
rx_status->flag |= RX_FLAG_RADIOTAP_HE;
|
|
|
deb259 |
|
|
|
deb259 |
+ he_type = rate_n_flags & RATE_MCS_HE_TYPE_MSK;
|
|
|
deb259 |
+
|
|
|
deb259 |
if (phy_info & IWL_RX_MPDU_PHY_TSF_OVERLOAD) {
|
|
|
deb259 |
- if (mvm->trans->cfg->device_family >= IWL_DEVICE_FAMILY_22560)
|
|
|
deb259 |
+ if (mvm->trans->cfg->device_family >=
|
|
|
deb259 |
+ IWL_DEVICE_FAMILY_22560)
|
|
|
deb259 |
he_phy_data = le64_to_cpu(desc->v3.he_phy_data);
|
|
|
deb259 |
else
|
|
|
deb259 |
he_phy_data = le64_to_cpu(desc->v1.he_phy_data);
|
|
|
deb259 |
|
|
|
deb259 |
if (he_type == RATE_MCS_HE_TYPE_MU) {
|
|
|
deb259 |
- he_mu = skb_put_data(skb, &mu_known, sizeof(mu_known));
|
|
|
deb259 |
+ he_mu = skb_put_data(skb, &mu_known,
|
|
|
deb259 |
+ sizeof(mu_known));
|
|
|
deb259 |
radiotap_len += sizeof(mu_known);
|
|
|
deb259 |
rx_status->flag |= RX_FLAG_RADIOTAP_HE_MU;
|
|
|
deb259 |
}
|