Commit 98c0de7b authored by Miri Korenblit's avatar Miri Korenblit Committed by Johannes Berg
Browse files

iwlwifi: mvm: remove vif_count 



We used to count the number of ieee80211_vifs in mvm.
This was needed for the legacy PM API, which is no longer
supported. Remove it.

Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20220517120045.8c91ae023b15.Ia6145e4930b1d28f3fcedc316b4f177295b00557@changeid


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

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

+3 −14
Original line number Diff line number Diff line
@@ -976,7 +976,6 @@ static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm) 


	ieee80211_wake_queues(mvm->hw);



	mvm->vif_count = 0;

	mvm->rx_ba_sessions = 0;

	mvm->fwrt.dump.conf = FW_DBG_INVALID;

	mvm->monitor_on = false;
@@ -1380,10 +1379,6 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, 


	rcu_assign_pointer(mvm->vif_id_to_mac[mvmvif->id], vif);



	/* Counting number of interfaces is needed for legacy PM */

	if (vif->type != NL80211_IFTYPE_P2P_DEVICE)

		mvm->vif_count++;



	/*

	 * The AP binding flow can be done only after the beacon

	 * template is configured (which happens only in the mac80211
@@ -1400,7 +1395,7 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, 
		ret = iwl_mvm_alloc_bcast_sta(mvm, vif);

		if (ret) {

			IWL_ERR(mvm, "Failed to allocate bcast sta\n");

			goto out_release;

			goto out_unlock;

		}



		/*
@@ -1411,7 +1406,7 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, 
					       0, vif->type,

					       IWL_STA_MULTICAST);

		if (ret)

			goto out_release;

			goto out_unlock;



		iwl_mvm_vif_dbgfs_register(mvm, vif);

		goto out_unlock;
@@ -1421,7 +1416,7 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, 


	ret = iwl_mvm_mac_ctxt_add(mvm, vif);

	if (ret)

		goto out_release;

		goto out_unlock;



	ret = iwl_mvm_power_update_mac(mvm);

	if (ret)
@@ -1498,9 +1493,6 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, 
 out_remove_mac:

	mvmvif->phy_ctxt = NULL;

	iwl_mvm_mac_ctxt_remove(mvm, vif);

 out_release:

	if (vif->type != NL80211_IFTYPE_P2P_DEVICE)

		mvm->vif_count--;

 out_unlock:

	mutex_unlock(&mvm->mutex);
@@ -1582,9 +1574,6 @@ static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw, 
		mvmvif->phy_ctxt = NULL;

	}



	if (mvm->vif_count && vif->type != NL80211_IFTYPE_P2P_DEVICE)

		mvm->vif_count--;



	iwl_mvm_power_update_mac(mvm);

	iwl_mvm_mac_ctxt_remove(mvm, vif);

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

+0 −1
Original line number Diff line number Diff line
@@ -934,7 +934,6 @@ struct iwl_mvm { 
	unsigned long fw_key_table[BITS_TO_LONGS(STA_KEY_MAX_NUM)];

	u8 fw_key_deleted[STA_KEY_MAX_NUM];



	u8 vif_count;

	struct ieee80211_vif __rcu *vif_id_to_mac[NUM_MAC_INDEX_DRIVER];



	/* -1 for always, 0 for never, >0 for that many times */