Commit ed714460 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho

iwlwifi: mvm: clean up NO_PSDU case

We now no longer have any special code in
iwl_mvm_pass_packet_to_mac80211(), so don't
need to pass NO_PSDU packets through it.
Stop doing so and clean up the code there.
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent fc36ffda
...@@ -258,10 +258,7 @@ static void iwl_mvm_pass_packet_to_mac80211(struct iwl_mvm *mvm, ...@@ -258,10 +258,7 @@ static void iwl_mvm_pass_packet_to_mac80211(struct iwl_mvm *mvm,
struct ieee80211_sta *sta, struct ieee80211_sta *sta,
bool csi) bool csi)
{ {
struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb); if (iwl_mvm_check_pn(mvm, skb, queue, sta))
if (!(rx_status->flag & RX_FLAG_NO_PSDU) &&
iwl_mvm_check_pn(mvm, skb, queue, sta))
kfree_skb(skb); kfree_skb(skb);
else else
ieee80211_rx_napi(mvm->hw, sta, skb, napi); ieee80211_rx_napi(mvm->hw, sta, skb, napi);
...@@ -1800,7 +1797,7 @@ void iwl_mvm_rx_monitor_ndp(struct iwl_mvm *mvm, struct napi_struct *napi, ...@@ -1800,7 +1797,7 @@ void iwl_mvm_rx_monitor_ndp(struct iwl_mvm *mvm, struct napi_struct *napi,
rx_status->rate_idx = rate; rx_status->rate_idx = rate;
} }
iwl_mvm_pass_packet_to_mac80211(mvm, napi, skb, queue, sta, false); ieee80211_rx_napi(mvm->hw, sta, skb, napi);
out: out:
rcu_read_unlock(); rcu_read_unlock();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment