|
 |
deb259 |
From f42afed74bd0869fed5a8cf2e99c4e06211f0e38 Mon Sep 17 00:00:00 2001
|
|
|
deb259 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
deb259 |
Date: Thu, 5 Sep 2019 18:19:04 +0200
|
|
|
deb259 |
Subject: [PATCH 09/43] Revert "iwlwifi: mvm: clean up NO_PSDU case"
|
|
|
deb259 |
|
|
|
deb259 |
This reverts commit ed714460a0ecd1d382a4cda1247fd6eb2666de28.
|
|
|
deb259 |
---
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 7 +++++--
|
|
|
deb259 |
1 file changed, 5 insertions(+), 2 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:41.856338491 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c 2019-09-06 01:25:42.023336361 +0200
|
|
|
deb259 |
@@ -274,7 +274,10 @@
|
|
|
deb259 |
struct ieee80211_sta *sta,
|
|
|
deb259 |
bool csi)
|
|
|
deb259 |
{
|
|
|
deb259 |
- if (iwl_mvm_check_pn(mvm, skb, queue, sta))
|
|
|
deb259 |
+ struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);
|
|
|
deb259 |
+
|
|
|
deb259 |
+ if (!(rx_status->flag & RX_FLAG_NO_PSDU) &&
|
|
|
deb259 |
+ iwl_mvm_check_pn(mvm, skb, queue, sta))
|
|
|
deb259 |
kfree_skb(skb);
|
|
|
deb259 |
else
|
|
|
deb259 |
ieee80211_rx_napi(mvm->hw, sta, skb, napi);
|
|
|
deb259 |
@@ -1814,7 +1817,7 @@
|
|
|
deb259 |
rx_status->rate_idx = rate;
|
|
|
deb259 |
}
|
|
|
deb259 |
|
|
|
deb259 |
- ieee80211_rx_napi(mvm->hw, sta, skb, napi);
|
|
|
deb259 |
+ iwl_mvm_pass_packet_to_mac80211(mvm, napi, skb, queue, sta, false);
|
|
|
deb259 |
out:
|
|
|
deb259 |
rcu_read_unlock();
|
|
|
deb259 |
}
|