Commit 87209b7f authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: mvm: d3: move GTK rekeys condition 



Move the GTK rekeying condition into iwl_mvm_set_key_rx_seq()
so we can modify it in the next patch. In the next firmware
API revision we'll properly get data for both active GTKs and
will have to install it accordingly.

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.20211204083238.f309942ddd15.Iaa95c602f3a681dd464e10ce2de047aa86fac19c@changeid


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

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

+9 −4
Original line number Diff line number Diff line
@@ -1651,8 +1651,12 @@ static void iwl_mvm_convert_key_counters(struct iwl_wowlan_status_data *status, 


static void iwl_mvm_set_key_rx_seq(struct iwl_mvm *mvm,

				   struct ieee80211_key_conf *key,

				   struct iwl_wowlan_status_data *status)

				   struct iwl_wowlan_status_data *status,

				   bool installed)

{

	if (status->num_of_gtk_rekeys && !installed)

		return;



	switch (key->cipher) {

	case WLAN_CIPHER_SUITE_CCMP:

	case WLAN_CIPHER_SUITE_GCMP:
@@ -1740,8 +1744,9 @@ static void iwl_mvm_d3_update_keys(struct ieee80211_hw *hw, 


	if (data->status->num_of_gtk_rekeys)

		ieee80211_remove_key(key);

	else if (data->last_gtk == key)

		iwl_mvm_set_key_rx_seq(data->mvm, key, data->status);



	if (data->last_gtk == key)

		iwl_mvm_set_key_rx_seq(data->mvm, key, data->status, false);

}



static bool iwl_mvm_setup_connection_keep(struct iwl_mvm *mvm,
@@ -1825,7 +1830,7 @@ static bool iwl_mvm_setup_connection_keep(struct iwl_mvm *mvm, 
		key = ieee80211_gtk_rekey_add(vif, &conf.conf);

		if (IS_ERR(key))

			return false;

		iwl_mvm_set_key_rx_seq(mvm, key, status);

		iwl_mvm_set_key_rx_seq(mvm, key, status, true);



		replay_ctr = cpu_to_be64(status->replay_ctr);