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

Commit 4bf881f5 authored by Alexander Bondar's avatar Alexander Bondar Committed by Johannes Berg
Browse files

iwlwifi: mvm: Change location of vif_count verification for PM 



Currently vif_count verification for power management enablement appear
in different places. Move these verifications to one place in
iwl_mvm_update_power_mode().

Signed-off-by: default avatarAlexander Bondar <alexander.bondar@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 86a91ec7

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

+6 −26
Original line number Diff line number Diff line
@@ -597,21 +597,11 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, 
	mvmvif->phy_ctxt = NULL;

	iwl_mvm_mac_ctxt_remove(mvm, vif);

 out_release:

	/*

	 * TODO: remove this temporary code.

	 * Currently MVM FW supports power management only on single MAC.

	 * Check if only one additional interface remains after releasing

	 * current one. Update power mode on the remaining interface.

	 */

	if (vif->type != NL80211_IFTYPE_P2P_DEVICE)

		mvm->vif_count--;

	IWL_DEBUG_MAC80211(mvm, "Currently %d interfaces active\n",

			   mvm->vif_count);

	if (mvm->vif_count == 1) {

	ieee80211_iterate_active_interfaces(

		mvm->hw, IEEE80211_IFACE_ITER_NORMAL,

		iwl_mvm_power_update_iterator, mvm);

	}

	iwl_mvm_mac_ctxt_release(mvm, vif);

 out_unlock:

	mutex_unlock(&mvm->mutex);
@@ -781,21 +771,11 @@ 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) {

		/*

		 * TODO: remove this temporary code.

		 * Currently MVM FW supports power management only on single

		 * MAC. Avoid power mode update if more than one interface

		 * is active.

		 */

		IWL_DEBUG_MAC80211(mvm, "Currently %d interfaces active\n",

				   mvm->vif_count);

		if (mvm->vif_count == 1) {

		ret = iwl_mvm_power_update_mode(mvm, vif);

		if (ret)

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

	}

}

}



static int iwl_mvm_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif)

{

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

+11 −0
Original line number Diff line number Diff line
@@ -246,6 +246,17 @@ int iwl_mvm_power_update_mode(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
	if (vif->type != NL80211_IFTYPE_STATION || vif->p2p)

		return 0;



	/*

	 * TODO: The following vif_count verification is temporary condition.

	 * Avoid power mode update if more than one interface is currently

	 * active. Remove this condition when FW will support power management

	 * on multiple MACs.

	 */

	IWL_DEBUG_POWER(mvm, "Currently %d interfaces active\n",

			mvm->vif_count);

	if (mvm->vif_count > 1)

		return 0;



	iwl_mvm_power_build_cmd(mvm, vif, &cmd);

	iwl_mvm_power_log(mvm, &cmd);