Commit 1f7698ab authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: mvm: fix A-MPDU reference assignment 



The current code assigns the reference, and then goes to increment
it if the toggle bit has changed. That way, we get

Toggle  0  0  0  0  1  1  1  1
ID      1  1  1  1  1  2  2  2

Fix that by assigning the post-toggle ID to get

Toggle  0  0  0  0  1  1  1  1
ID      1  1  1  1  2  2  2  2

Reported-by: default avatarDanny Alexander <danny.alexander@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Fixes: fbe41127 ("iwlwifi: mvm: update mpdu metadata API")
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 698478c4

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

+1 −1
Original line number Diff line number Diff line
@@ -1438,12 +1438,12 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi, 
		bool toggle_bit = phy_info & IWL_RX_MPDU_PHY_AMPDU_TOGGLE;



		rx_status->flag |= RX_FLAG_AMPDU_DETAILS;

		rx_status->ampdu_reference = mvm->ampdu_ref;

		/* toggle is switched whenever new aggregation starts */

		if (toggle_bit != mvm->ampdu_toggle) {

			mvm->ampdu_ref++;

			mvm->ampdu_toggle = toggle_bit;

		}

		rx_status->ampdu_reference = mvm->ampdu_ref;

	}



	rcu_read_lock();