lkml.org 
[lkml]   [2017]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 069/164] iwlwifi: mvm: enable RX offloading with TKIP and WEP
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: David Spinadel <david.spinadel@intel.com>

    commit 9d0fc5a50a0548f8e5d61243e5e5f26d5c405aef upstream.

    Set the flag that indicates that ICV was stripped on if
    this option was enabled in the HW.

    [this is needed for the 9000-series HW to work properly]
    Signed-off-by: David Spinadel <david.spinadel@intel.com>
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    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(-)

    --- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
    +++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
    @@ -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
    --- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
    +++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
    @@ -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;
    }

    \
     
     \ /
      Last update: 2017-12-12 14:52    [W:2.927 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site