Merge remote-tracking branch 'regmap/for-next'

[deliverable/linux.git] / drivers / net / wireless / intel / iwlwifi / mvm / rxmq.c

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
index df6c32caa5f0ca3f45b2347d18747e7dbe03ec7c..08d8a8abb9188590552cfbab852ba619b2f77d60 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
@@ -132,7 +132,8 @@ static inline int iwl_mvm_check_pn(struct iwl_mvm *mvm, struct sk_buff *skb,
                   IEEE80211_CCMP_PN_LEN) <= 0)
                return -1;
 
-       memcpy(ptk_pn->q[queue].pn[tid], pn, IEEE80211_CCMP_PN_LEN);
+       if (!(stats->flag & RX_FLAG_AMSDU_MORE))
+               memcpy(ptk_pn->q[queue].pn[tid], pn, IEEE80211_CCMP_PN_LEN);
        stats->flag |= RX_FLAG_PN_VALIDATED;
 
        return 0;
@@ -883,6 +884,9 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,
                        u8 *qc = ieee80211_get_qos_ctl(hdr);
 
                        *qc &= ~IEEE80211_QOS_CTL_A_MSDU_PRESENT;
+                       if (!(desc->amsdu_info &
+                             IWL_RX_MPDU_AMSDU_LAST_SUBFRAME))
+                               rx_status->flag |= RX_FLAG_AMSDU_MORE;
                }
                if (baid != IWL_RX_REORDER_DATA_INVALID_BAID)
                        iwl_mvm_agg_rx_received(mvm, baid);