iwlwifi: mvm: add support for new version of WOWLAN_TKIP_SETTING_API_S (870bde78) · Commits · 戴 / test

drivers/net/wireless/intel/iwlwifi/fw/api/d3.h

+12 −3

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@
		* Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
		* Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
		* Copyright(c) 2015 - 2017 Intel Deutschland GmbH
		* Copyright(c) 2018 - 2019 Intel Corporation
		* Copyright(c) 2018 - 2020 Intel Corporation
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of version 2 of the GNU General Public License as
		@@ -31,7 +31,7 @@
		* Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
		* Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
		* Copyright(c) 2015 - 2017 Intel Deutschland GmbH
		* Copyright(c) 2018 - 2019 Intel Corporation
		* Copyright(c) 2018 - 2020 Intel Corporation
		* All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		@@ -469,13 +469,22 @@ struct iwl_p1k_cache {

		#define IWL_NUM_RX_P1K_CACHE 2

		struct iwl_wowlan_tkip_params_cmd {
		struct iwl_wowlan_tkip_params_cmd_ver_1 {
		struct iwl_mic_keys mic_keys;
		struct iwl_p1k_cache tx;
		struct iwl_p1k_cache rx_uni[IWL_NUM_RX_P1K_CACHE];
		struct iwl_p1k_cache rx_multi[IWL_NUM_RX_P1K_CACHE];
		} __packed; /* WOWLAN_TKIP_SETTING_API_S_VER_1 */

		struct iwl_wowlan_tkip_params_cmd {
		struct iwl_mic_keys mic_keys;
		struct iwl_p1k_cache tx;
		struct iwl_p1k_cache rx_uni[IWL_NUM_RX_P1K_CACHE];
		struct iwl_p1k_cache rx_multi[IWL_NUM_RX_P1K_CACHE];
		u8 reversed[2];
		__le32 sta_id;
		} __packed; /* WOWLAN_TKIP_SETTING_API_S_VER_2 */

		#define IWL_KCK_MAX_SIZE 32
		#define IWL_KEK_MAX_SIZE 32

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

+18 −1

Original line number	Diff line number	Diff line
		@@ -783,9 +783,26 @@ static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm,
		if (key_data.use_tkip &&
		!fw_has_api(&mvm->fw->ucode_capa,
		IWL_UCODE_TLV_API_TKIP_MIC_KEYS)) {
		int ver = iwl_fw_lookup_cmd_ver(mvm->fw, LONG_GROUP,
		WOWLAN_TKIP_PARAM);
		int size;

		if (ver == 2) {
		size = sizeof(tkip_cmd);
		key_data.tkip->sta_id =
		cpu_to_le32(mvmvif->ap_sta_id);
		} else if (ver == 1 \|\| ver == IWL_FW_CMD_VER_UNKNOWN) {
		size = sizeof(struct iwl_wowlan_tkip_params_cmd_ver_1);
		} else {
		ret = -EINVAL;
		WARN_ON_ONCE(1);
		goto out;
		}

		/* send relevant data according to CMD version */
		ret = iwl_mvm_send_cmd_pdu(mvm,
		WOWLAN_TKIP_PARAM,
		cmd_flags, sizeof(tkip_cmd),
		cmd_flags, size,
		&tkip_cmd);
		if (ret)
		goto out;

Admin message