Patch "iwlwifi: mvm: enable RX offloading with TKIP and WEP" has been added to the 4.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
iwlwifi: mvm: enable RX offloading with TKIP and WEP
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
iwlwifi-mvm-enable-rx-offloading-with-tkip-and-wep.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
9d0fc5a50a0548f8e5d61243e5e5f26d5c405aefMon Sep 17 00:00:00 2001
From: David Spinadel <[email protected]>
Date: Mon, 21 Nov 2016 17:01:25 +0200
Subject: iwlwifi: mvm: enable RX offloading with TKIP and WEP
From: David Spinadel <[email protected]>
commit 9d0fc5a50a0548f8e5d61243e5e5f26d5c405aef upstream.
Set the flag that indicates that ICV was stripped on if this option was enabled in the HW.
--- drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 4 +++- drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 12 +++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-)
drivers/net/wireless/intel/iwlwifi/iwl-trans.h +3 -1
@@ -117,6 +117,7 @@#define FH_RSCSR_FRAME_INVALID 0x55550000#define FH_RSCSR_FRAME_ALIGN 0x40#define FH_RSCSR_RPA_EN BIT(25) +#define FH_RSCSR_RADA_EN BIT(26)#define FH_RSCSR_RXQ_POS 16#define FH_RSCSR_RXQ_MASK 0x3F0000
@@ -128,7 +129,8 @@ struct iwl_rx_packet {* 31: flag flush RB request * 30: flag ignore TC (terminal counter) request * 29: flag fast IRQ request -* 28-26: Reserved +* 28-27: Reserved +* 26: RADA enabled * 25: Offload enabled * 24: RPF enabled * 23: RSS enabled
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +9 -3
@@ -232,8 +232,8 @@ static void iwl_mvm_get_signal_strength(static int iwl_mvm_rx_crypto (struct iwl_mvm *mvm,struct ieee80211_hdr *hdr,struct ieee80211_rx_status *stats, -struct iwl_rx_mpdu_desc *desc,int queue, -u8 *crypt_len) +struct iwl_rx_mpdu_desc *desc,u32 pkt_flags, +int queue,u8 *crypt_len) {u16 status =le16_to_cpu (desc->status);
@@ -272,6 +272,10 @@ static int iwl_mvm_rx_crypto(struct iwl_if ((status &IWL_RX_MPDU_STATUS_SEC_MASK ) ==IWL_RX_MPDU_STATUS_SEC_WEP ) *crypt_len =IEEE80211_WEP_IV_LEN ; + +if (pkt_flags &FH_RSCSR_RADA_EN ) + stats->flag |=RX_FLAG_ICV_STRIPPED ; +return 0 ;case IWL_RX_MPDU_STATUS_SEC_EXT_ENC :if (!(status &IWL_RX_MPDU_STATUS_MIC_OK ))
@@ -812,7 +816,9 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm * rx_status =IEEE80211_SKB_RXCB (skb); -if (iwl_mvm_rx_crypto (mvm, hdr, rx_status, desc, queue, &crypt_len)) { +if (iwl_mvm_rx_crypto (mvm, hdr, rx_status, desc, +le32_to_cpu (pkt->len_n_flags), queue, + &crypt_len)) {kfree_skb (skb);return ; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/iwlwifi-mvm-enable-rx-offloading-with-tkip-and-wep.patch