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

Commit 7c8b3bc6 authored by Luciano Coelho's avatar Luciano Coelho Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: set MAC_FILTER_IN_BEACON correctly for STA/P2P client 



In commit cad3f08c (iwlwifi: mvm: enable MAC_FILTER_IN_BEACON when
forced_assoc_off is set) the code to set the MAC_FILTER_IN_BEACON flag
was accidentally moved to the main block of the if statement, while it
should be in the else block instead.  Move it to the right place.

Fixes: cad3f08c ("iwlwifi: mvm: enable MAC_FILTER_IN_BEACON when forced_assoc_off is set")
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 787d6c1f

drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -721,11 +721,6 @@ static int iwl_mvm_mac_ctxt_cmd_sta(struct iwl_mvm *mvm, 
	    !force_assoc_off) {

	    !force_assoc_off) {

		u32 dtim_offs;

		u32 dtim_offs;





		/* Allow beacons to pass through as long as we are not

		 * associated, or we do not have dtim period information.

		 */

		cmd.filter_flags |= cpu_to_le32(MAC_FILTER_IN_BEACON);



		/*

		/*

		 * The DTIM count counts down, so when it is N that means N

		 * The DTIM count counts down, so when it is N that means N

		 * more beacon intervals happen until the DTIM TBTT. Therefore

		 * more beacon intervals happen until the DTIM TBTT. Therefore
@@ -759,6 +754,11 @@ static int iwl_mvm_mac_ctxt_cmd_sta(struct iwl_mvm *mvm, 
		ctxt_sta->is_assoc = cpu_to_le32(1);

		ctxt_sta->is_assoc = cpu_to_le32(1);

	} else {

	} else {

		ctxt_sta->is_assoc = cpu_to_le32(0);

		ctxt_sta->is_assoc = cpu_to_le32(0);



		/* Allow beacons to pass through as long as we are not

		 * associated, or we do not have dtim period information.

		 */

		cmd.filter_flags |= cpu_to_le32(MAC_FILTER_IN_BEACON);

	}

	}





	ctxt_sta->bi = cpu_to_le32(vif->bss_conf.beacon_int);

	ctxt_sta->bi = cpu_to_le32(vif->bss_conf.beacon_int);