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

Commit 29a90a49 authored by Eliad Peller's avatar Eliad Peller Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: add D0i3 ref/unref when ap, ibss or p2p_cli vifs are running 



We don't want to go into D0i3, when P2P_CLI, AP (including
GO) or IBSS interfaces are running, so take appropriate
references.

Signed-off-by: default avatarEliad Peller <eliadx.peller@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 9f45c36d

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

+9 −0
Original line number Diff line number Diff line
@@ -1202,6 +1202,8 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm, 


			iwl_mvm_sf_update(mvm, vif, false);

			iwl_mvm_power_vif_assoc(mvm, vif);

			if (vif->p2p)

				iwl_mvm_ref(mvm, IWL_MVM_REF_P2P_CLIENT);

		} else if (mvmvif->ap_sta_id != IWL_MVM_STATION_COUNT) {

			/*

			 * If update fails - SF might be running in associated
@@ -1219,6 +1221,9 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm, 
			ret = iwl_mvm_update_quotas(mvm, NULL);

			if (ret)

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



			if (vif->p2p)

				iwl_mvm_unref(mvm, IWL_MVM_REF_P2P_CLIENT);

		}



		iwl_mvm_recalc_multicast(mvm);
@@ -1327,6 +1332,8 @@ static int iwl_mvm_start_ap_ibss(struct ieee80211_hw *hw, 
	if (vif->p2p && mvm->p2p_device_vif)

		iwl_mvm_mac_ctxt_changed(mvm, mvm->p2p_device_vif);



	iwl_mvm_ref(mvm, IWL_MVM_REF_AP_IBSS);



	iwl_mvm_bt_coex_vif_change(mvm);



	mutex_unlock(&mvm->mutex);
@@ -1360,6 +1367,8 @@ static void iwl_mvm_stop_ap_ibss(struct ieee80211_hw *hw, 


	iwl_mvm_bt_coex_vif_change(mvm);



	iwl_mvm_unref(mvm, IWL_MVM_REF_AP_IBSS);



	/* Need to update the P2P Device MAC (only GO, IBSS is single vif) */

	if (vif->p2p && mvm->p2p_device_vif)

		iwl_mvm_mac_ctxt_changed(mvm, mvm->p2p_device_vif);

drivers/net/wireless/iwlwifi/mvm/mvm.h

+2 −0
Original line number Diff line number Diff line
@@ -243,6 +243,8 @@ enum iwl_mvm_ref_type { 
	IWL_MVM_REF_UCODE_DOWN,

	IWL_MVM_REF_SCAN,

	IWL_MVM_REF_ROC,

	IWL_MVM_REF_P2P_CLIENT,

	IWL_MVM_REF_AP_IBSS,



	IWL_MVM_REF_COUNT,

};