Commit 95a62c33 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: mvm: simplify __iwl_mvm_set_sta_key() 



There's no need to differentiate identical default and cipher
type cases, nor do we really need to have a 'ret' variable.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210802215208.e89178b22fbf.I4d62baad9a9fdfd5c645a3cc5dbffb22feab5033@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 199d895f

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

+7 −19
Original line number Diff line number Diff line
@@ -3473,7 +3473,6 @@ static int __iwl_mvm_set_sta_key(struct iwl_mvm *mvm, 
				 u8 key_offset,

				 bool mcast)

{

	int ret;

	const u8 *addr;

	struct ieee80211_key_seq seq;

	u16 p1k[5];
@@ -3495,30 +3494,19 @@ static int __iwl_mvm_set_sta_key(struct iwl_mvm *mvm, 
		return -EINVAL;

	}



	switch (keyconf->cipher) {

	case WLAN_CIPHER_SUITE_TKIP:

	if (keyconf->cipher == WLAN_CIPHER_SUITE_TKIP) {

		addr = iwl_mvm_get_mac_addr(mvm, vif, sta);

		/* get phase 1 key from mac80211 */

		ieee80211_get_key_rx_seq(keyconf, 0, &seq);

		ieee80211_get_tkip_rx_p1k(keyconf, addr, seq.tkip.iv32, p1k);

		ret = iwl_mvm_send_sta_key(mvm, sta_id, keyconf, mcast,



		return iwl_mvm_send_sta_key(mvm, sta_id, keyconf, mcast,

					    seq.tkip.iv32, p1k, 0, key_offset,

					    mfp);

		break;

	case WLAN_CIPHER_SUITE_CCMP:

	case WLAN_CIPHER_SUITE_WEP40:

	case WLAN_CIPHER_SUITE_WEP104:

	case WLAN_CIPHER_SUITE_GCMP:

	case WLAN_CIPHER_SUITE_GCMP_256:

		ret = iwl_mvm_send_sta_key(mvm, sta_id, keyconf, mcast,

					   0, NULL, 0, key_offset, mfp);

		break;

	default:

		ret = iwl_mvm_send_sta_key(mvm, sta_id, keyconf, mcast,

					   0, NULL, 0, key_offset, mfp);

	}



	return ret;

	return iwl_mvm_send_sta_key(mvm, sta_id, keyconf, mcast,

				    0, NULL, 0, key_offset, mfp);

}



int iwl_mvm_set_sta_key(struct iwl_mvm *mvm,