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

Commit 2001a130 authored by Johannes Berg's avatar Johannes Berg
Browse files

iwlwifi: mvm: don't set K1/K2 for AES-CMAC 



According to firmware engineers, the firmware has never required
these fields and the values have always been calculated, they were
just leftovers from a previous implementation.

Therefore remove the unnecessary calculation.

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

drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h

+2 −2
Original line number Diff line number Diff line
@@ -366,8 +366,8 @@ struct iwl_mvm_rm_sta_cmd { 
 * ( MGMT_MCAST_KEY = 0x1f )

 * @ctrl_flags: %iwl_sta_key_flag

 * @IGTK:

 * @K1: IGTK master key

 * @K2: IGTK sub key

 * @K1: unused

 * @K2: unused

 * @sta_id: station ID that support IGTK

 * @key_id:

 * @receive_seq_cnt: initial RSC/PN needed for replay check

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

+0 −2
Original line number Diff line number Diff line
@@ -1277,8 +1277,6 @@ static int iwl_mvm_send_sta_igtk(struct iwl_mvm *mvm, 
		const u8 *pn;



		memcpy(igtk_cmd.IGTK, keyconf->key, keyconf->keylen);

		ieee80211_aes_cmac_calculate_k1_k2(keyconf,

						   igtk_cmd.K1, igtk_cmd.K2);

		ieee80211_get_key_rx_seq(keyconf, 0, &seq);

		pn = seq.aes_cmac.pn;

		igtk_cmd.receive_seq_cnt = cpu_to_le64(((u64) pn[5] << 0) |