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

Commit 1bc10d3b authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: correctly handle PM/QoS changes from mac80211 



When mac80211 requests multiple BSS config changes, as for example
while associating, we ignore power management and QoS changes and
only apply them later. Fix that by removing the "else" and making
the conditions independent.

Also move it after (potential) beacon filter enablement to have
that already enabled when going into power management code.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 22d059a5

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+6 −5
Original line number Diff line number Diff line
@@ -1526,11 +1526,6 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm, 
		 */

		iwl_mvm_remove_time_event(mvm, mvmvif,

					  &mvmvif->time_event_data);

	} else if (changes & (BSS_CHANGED_PS | BSS_CHANGED_P2P_PS |

			      BSS_CHANGED_QOS)) {

		ret = iwl_mvm_power_update_mac(mvm);

		if (ret)

			IWL_ERR(mvm, "failed to update power mode\n");

	}



	if (changes & BSS_CHANGED_BEACON_INFO) {
@@ -1538,6 +1533,12 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm, 
		WARN_ON(iwl_mvm_enable_beacon_filter(mvm, vif, 0));

	}



	if (changes & (BSS_CHANGED_PS | BSS_CHANGED_P2P_PS | BSS_CHANGED_QOS)) {

		ret = iwl_mvm_power_update_mac(mvm);

		if (ret)

			IWL_ERR(mvm, "failed to update power mode\n");

	}



	if (changes & BSS_CHANGED_TXPOWER) {

		IWL_DEBUG_CALIB(mvm, "Changing TX Power to %d\n",

				bss_conf->txpower);