Commit a3b8008d authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: mac80211: move ps setting to vif config 



This really shouldn't be in a per-link config, we don't want
to let anyone control it that way (if anything, link powersave
could be forced through APIs to activate/deactivate a link),
and we don't support powersave in software with devices that
can do MLO.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 3fbddae4

drivers/net/wireless/ath/ath10k/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -6252,7 +6252,7 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw, 
	}



	if (changed & BSS_CHANGED_PS) {

		arvif->ps = vif->bss_conf.ps;

		arvif->ps = vif->cfg.ps;



		ret = ath10k_config_ps(ar);

		if (ret)

drivers/net/wireless/ath/ath11k/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -3292,7 +3292,7 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw, 


	if (changed & BSS_CHANGED_PS &&

	    ar->ab->hw_params.supports_sta_ps) {

		arvif->ps = vif->bss_conf.ps;

		arvif->ps = vif->cfg.ps;



		ret = ath11k_mac_config_ps(ar);

		if (ret)

drivers/net/wireless/ath/wcn36xx/main.c

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static void wcn36xx_change_ps(struct wcn36xx *wcn, bool enable) 
	list_for_each_entry(tmp, &wcn->vif_list, list) {

		vif = wcn36xx_priv_to_vif(tmp);

		if (enable && !wcn->sw_scan) {

			if (vif->bss_conf.ps) /* ps allowed ? */

			if (vif->cfg.ps) /* ps allowed ? */

				wcn36xx_pmc_enter_bmps_state(wcn, vif);

		} else {

			wcn36xx_pmc_exit_bmps_state(wcn, vif);

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

+2 −2
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm, 


	cmd->flags |= cpu_to_le16(POWER_FLAGS_POWER_SAVE_ENA_MSK);



	if (!vif->bss_conf.ps || !mvmvif->pm_enabled)

	if (!vif->cfg.ps || !mvmvif->pm_enabled)

		return;



	if (iwl_mvm_vif_low_latency(mvmvif) && vif->p2p &&
@@ -890,7 +890,7 @@ static int iwl_mvm_power_set_ba(struct iwl_mvm *mvm, 


	mvmvif->bf_data.ba_enabled = !(!mvmvif->pm_enabled ||

				       mvm->ps_disabled ||

				       !vif->bss_conf.ps ||

				       !vif->cfg.ps ||

				       iwl_mvm_vif_low_latency(mvmvif));



	return _iwl_mvm_enable_beacon_filter(mvm, vif, &cmd, 0);

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

+1 −1
Original line number Diff line number Diff line
@@ -1861,7 +1861,7 @@ static bool rs_tpc_allowed(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
	int index = rate->index;

	bool cam = (iwlmvm_mod_params.power_scheme == IWL_POWER_SCHEME_CAM);

	bool sta_ps_disabled = (vif->type == NL80211_IFTYPE_STATION &&

				!vif->bss_conf.ps);

				!vif->cfg.ps);



	IWL_DEBUG_RATE(mvm, "cam: %d sta_ps_disabled %d\n",

		       cam, sta_ps_disabled);