Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1ae02b1 authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: mvm: allow same PN for de-aggregated AMSDU 



The 9000 hardware will de-aggregate AMSDUs. In the process
it will copy the mac header "as is" to the new MPDUs.
This means driver should allow the same PN for MPDUs originated
from the same AMSDU.
Do that by incrementing the PN only for the last MPDU in the
sequence.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 60747ef4

drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c

+5 −1
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ static inline int iwl_mvm_check_pn(struct iwl_mvm *mvm, struct sk_buff *skb, 
		   IEEE80211_CCMP_PN_LEN) <= 0)

		return -1;



	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;
@@ -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);