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

Commit 5f7a1847 authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: change iwl_mvm_get_key_sta_id() to return the station 



The code in iwl_mvm_update_tkip_key() is now pretty much duplicated
with the code in iwl_mvm_get_key_sta_id() doing the station ID lookup
again after it was already done. Change iwl_mvm_get_key_sta_id() to
iwl_mvm_get_key_sta(), returning the mvm_sta pointer, to allow that
duplicate code to be removed.

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

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

+22 −31
Original line number Diff line number Diff line
@@ -1228,17 +1228,14 @@ static int iwl_mvm_set_fw_key_idx(struct iwl_mvm *mvm) 
	return max_offs;

}



static u8 iwl_mvm_get_key_sta_id(struct iwl_mvm *mvm,

static struct iwl_mvm_sta *iwl_mvm_get_key_sta(struct iwl_mvm *mvm,

					       struct ieee80211_vif *vif,

					       struct ieee80211_sta *sta)

{

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);



	if (sta) {

		struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);



		return mvm_sta->sta_id;

	}

	if (sta)

		return iwl_mvm_sta_from_mac80211(sta);



	/*

	 * The device expects GTKs for station interfaces to be
@@ -1257,12 +1254,12 @@ static u8 iwl_mvm_get_key_sta_id(struct iwl_mvm *mvm, 
		 * be the AP ID, and no station was passed by mac80211.

		 */

		if (IS_ERR_OR_NULL(sta))

			return IWL_MVM_STATION_COUNT;

			return NULL;



		return sta_id;

		return iwl_mvm_sta_from_mac80211(sta);

	}



	return IWL_MVM_STATION_COUNT;

	return NULL;

}



static int iwl_mvm_send_sta_key(struct iwl_mvm *mvm,
@@ -1479,6 +1476,7 @@ int iwl_mvm_set_sta_key(struct iwl_mvm *mvm, 
			u8 key_offset)

{

	bool mcast = !(keyconf->flags & IEEE80211_KEY_FLAG_PAIRWISE);

	struct iwl_mvm_sta *mvm_sta;

	u8 sta_id;

	int ret;

	static const u8 __maybe_unused zero_addr[ETH_ALEN] = {0};
@@ -1486,11 +1484,12 @@ int iwl_mvm_set_sta_key(struct iwl_mvm *mvm, 
	lockdep_assert_held(&mvm->mutex);



	/* Get the station id from the mvm local station table */

	sta_id = iwl_mvm_get_key_sta_id(mvm, vif, sta);

	if (sta_id == IWL_MVM_STATION_COUNT) {

		IWL_ERR(mvm, "Failed to find station id\n");

	mvm_sta = iwl_mvm_get_key_sta(mvm, vif, sta);

	if (!mvm_sta) {

		IWL_ERR(mvm, "Failed to find station\n");

		return -EINVAL;

	}

	sta_id = mvm_sta->sta_id;



	if (keyconf->cipher == WLAN_CIPHER_SUITE_AES_CMAC) {

		ret = iwl_mvm_send_sta_igtk(mvm, keyconf, sta_id, false);
@@ -1566,13 +1565,14 @@ int iwl_mvm_remove_sta_key(struct iwl_mvm *mvm, 
			   struct ieee80211_key_conf *keyconf)

{

	bool mcast = !(keyconf->flags & IEEE80211_KEY_FLAG_PAIRWISE);

	u8 sta_id;

	struct iwl_mvm_sta *mvm_sta;

	u8 sta_id = IWL_MVM_STATION_COUNT;

	int ret, i;



	lockdep_assert_held(&mvm->mutex);



	/* Get the station id from the mvm local station table */

	sta_id = iwl_mvm_get_key_sta_id(mvm, vif, sta);

	/* Get the station from the mvm local station table */

	mvm_sta = iwl_mvm_get_key_sta(mvm, vif, sta);



	IWL_DEBUG_WEP(mvm, "mvm remove dynamic key: idx=%d sta=%d\n",

		      keyconf->keyidx, sta_id);
@@ -1593,11 +1593,13 @@ int iwl_mvm_remove_sta_key(struct iwl_mvm *mvm, 
	}

	mvm->fw_key_deleted[keyconf->hw_key_idx] = 0;



	if (sta_id == IWL_MVM_STATION_COUNT) {

	if (!mvm_sta) {

		IWL_DEBUG_WEP(mvm, "station non-existent, early return.\n");

		return 0;

	}



	sta_id = mvm_sta->sta_id;



	ret = __iwl_mvm_remove_sta_key(mvm, sta_id, keyconf, mcast);

	if (ret)

		return ret;
@@ -1617,24 +1619,13 @@ void iwl_mvm_update_tkip_key(struct iwl_mvm *mvm, 
			     u16 *phase1key)

{

	struct iwl_mvm_sta *mvm_sta;

	u8 sta_id;

	bool mcast = !(keyconf->flags & IEEE80211_KEY_FLAG_PAIRWISE);



	rcu_read_lock();



	sta_id = iwl_mvm_get_key_sta_id(mvm, vif, sta);

	if (WARN_ON_ONCE(sta_id == IWL_MVM_STATION_COUNT))

	mvm_sta = iwl_mvm_get_key_sta(mvm, vif, sta);

	if (WARN_ON_ONCE(!mvm_sta))

		goto unlock;



	if (!sta) {

		sta = rcu_dereference(mvm->fw_id_to_mac_id[sta_id]);

		if (WARN_ON(IS_ERR_OR_NULL(sta))) {

			rcu_read_unlock();

			return;

		}

	}



	mvm_sta = iwl_mvm_sta_from_mac80211(sta);

	iwl_mvm_send_sta_key(mvm, mvm_sta, keyconf, mcast,

			     iv32, phase1key, CMD_ASYNC, keyconf->hw_key_idx);