|
 |
deb259 |
From 4edf3a23bf91859531bcfaa54451c8c39e60bb0b Mon Sep 17 00:00:00 2001
|
|
|
deb259 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
deb259 |
Date: Thu, 5 Sep 2019 18:47:12 +0200
|
|
|
deb259 |
Subject: [PATCH 26/43] Revert "iwlwifi: mvm: remove unnecessary overload
|
|
|
deb259 |
variable"
|
|
|
deb259 |
|
|
|
deb259 |
This reverts commit 07f62bb953e83f070df068589b391f74cc06ccca.
|
|
|
deb259 |
---
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 6 +++---
|
|
|
deb259 |
1 file changed, 3 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.696302266 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c 2019-09-06 01:25:44.863300136 +0200
|
|
|
deb259 |
@@ -993,6 +993,7 @@
|
|
|
deb259 |
IEEE80211_RADIOTAP_HE_MU_FLAGS2_BW_FROM_SIG_A_BW_KNOWN),
|
|
|
deb259 |
};
|
|
|
deb259 |
unsigned int radiotap_len = 0;
|
|
|
deb259 |
+ bool overload = phy_info & IWL_RX_MPDU_PHY_TSF_OVERLOAD;
|
|
|
deb259 |
bool sigb_data = false;
|
|
|
deb259 |
|
|
|
deb259 |
he = skb_put_data(skb, &known, sizeof(known));
|
|
|
deb259 |
@@ -1019,8 +1020,7 @@
|
|
|
deb259 |
/* temporarily hide the radiotap data */
|
|
|
deb259 |
__skb_pull(skb, radiotap_len);
|
|
|
deb259 |
|
|
|
deb259 |
- if (he_phy_data != HE_PHY_DATA_INVAL &&
|
|
|
deb259 |
- he_type == RATE_MCS_HE_TYPE_SU) {
|
|
|
deb259 |
+ if (overload && he_type == RATE_MCS_HE_TYPE_SU) {
|
|
|
deb259 |
he->data1 |=
|
|
|
deb259 |
cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_UL_DL_KNOWN);
|
|
|
deb259 |
if (FIELD_GET(IWL_RX_HE_PHY_UPLINK, he_phy_data))
|
|
|
deb259 |
@@ -1033,7 +1033,7 @@
|
|
|
deb259 |
if (FIELD_GET(IWL_RX_HE_PHY_DELIM_EOF, he_phy_data))
|
|
|
deb259 |
rx_status->flag |= RX_FLAG_AMPDU_EOF_BIT;
|
|
|
deb259 |
}
|
|
|
deb259 |
- } else if (he_phy_data != HE_PHY_DATA_INVAL && he_mu) {
|
|
|
deb259 |
+ } else if (overload && he_mu && he_phy_data != HE_PHY_DATA_INVAL) {
|
|
|
deb259 |
he_mu->flags1 |=
|
|
|
deb259 |
le16_encode_bits(FIELD_GET(IWL_RX_HE_PHY_MU_SIBG_SYM_OR_USER_NUM_MASK,
|
|
|
deb259 |
he_phy_data),
|