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

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

iwlwifi: mvm: don't reset key index on HW restart 



When a firmware restart is done, don't try to reprogram the keys to new
slots but rather just keep the old key index, while skipping keys that
weren't programmed before.

Not only does this restore the state more faithfully, but it will also
allow using the HW key index for internal purposes as an array index.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Reviewed-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 133c8259

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

+14 −2
Original line number Diff line number Diff line
@@ -1249,7 +1249,6 @@ static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm) 
	mvm->d0i3_ap_sta_id = IWL_MVM_STATION_COUNT;



	iwl_mvm_reset_phy_ctxts(mvm);

	memset(mvm->fw_key_table, 0, sizeof(mvm->fw_key_table));

	memset(mvm->sta_drained, 0, sizeof(mvm->sta_drained));

	memset(mvm->tfd_drained, 0, sizeof(mvm->tfd_drained));

	memset(&mvm->last_bt_notif, 0, sizeof(mvm->last_bt_notif));
@@ -2843,8 +2842,21 @@ static int iwl_mvm_mac_set_key(struct ieee80211_hw *hw, 
			break;

		}



		/* During FW restart, in order to restore the state as it was,

		 * don't try to reprogram keys we previously failed for.

		 */

		if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status) &&

		    key->hw_key_idx == STA_KEY_IDX_INVALID) {

			IWL_DEBUG_MAC80211(mvm,

					   "skip invalid idx key programming during restart\n");

			ret = 0;

			break;

		}



		IWL_DEBUG_MAC80211(mvm, "set hwcrypto key\n");

		ret = iwl_mvm_set_sta_key(mvm, vif, sta, key, false);

		ret = iwl_mvm_set_sta_key(mvm, vif, sta, key,

					  test_bit(IWL_MVM_STATUS_IN_HW_RESTART,

						   &mvm->status));

		if (ret) {

			IWL_WARN(mvm, "set key failed\n");

			/*