iwlwifi: remove unused REMOTE_WAKE_CONFIG_CMD definitions

We don't use this command anymore and it is going to be removed from
the FW.  Remove all related definitions.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210612142637.549b282ae9a4.Iced05882d73b869e19f50e6a6e7bf9ce6cd7899b@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
index c625d319142e4774224466239a4a5d5ae5a032a0..ce060c3dfd7bec3544368c8c9aec6f042e9ea63f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
@@ -534,11 +534,6 @@ enum iwl_legacy_cmds {
         */
        OFFLOADS_QUERY_CMD = 0xd5,
 
-       /**
-        * @REMOTE_WAKE_CONFIG_CMD: &struct iwl_wowlan_remote_wake_config
-        */
-       REMOTE_WAKE_CONFIG_CMD = 0xd6,
-
        /**
         * @D0I3_END_CMD: End D0i3/D3 state, no command data
         */

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h b/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h
index 758639084e0c6e1a99738a3371c8c74c78363cd0..6488c0f8b471115ebdf6ed8b059c30300f59e8f3 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
 /*
- * Copyright (C) 2012-2014, 2018-2020 Intel Corporation
+ * Copyright (C) 2012-2014, 2018-2021 Intel Corporation
  * Copyright (C) 2013-2014 Intel Mobile Communications GmbH
  * Copyright (C) 2015-2017 Intel Deutschland GmbH
  */
@@ -683,55 +683,6 @@ static inline u8 iwlmvm_wowlan_gtk_idx(struct iwl_wowlan_gtk_status *gtk)
        return gtk->key_flags & IWL_WOWLAN_GTK_IDX_MASK;
 }
 
-#define IWL_WOWLAN_TCP_MAX_PACKET_LEN          64
-#define IWL_WOWLAN_REMOTE_WAKE_MAX_PACKET_LEN  128
-#define IWL_WOWLAN_REMOTE_WAKE_MAX_TOKENS      2048
-
-struct iwl_tcp_packet_info {
-       __le16 tcp_pseudo_header_checksum;
-       __le16 tcp_payload_length;
-} __packed; /* TCP_PACKET_INFO_API_S_VER_2 */
-
-struct iwl_tcp_packet {
-       struct iwl_tcp_packet_info info;
-       u8 rx_mask[IWL_WOWLAN_MAX_PATTERN_LEN / 8];
-       u8 data[IWL_WOWLAN_TCP_MAX_PACKET_LEN];
-} __packed; /* TCP_PROTOCOL_PACKET_API_S_VER_1 */
-
-struct iwl_remote_wake_packet {
-       struct iwl_tcp_packet_info info;
-       u8 rx_mask[IWL_WOWLAN_MAX_PATTERN_LEN / 8];
-       u8 data[IWL_WOWLAN_REMOTE_WAKE_MAX_PACKET_LEN];
-} __packed; /* TCP_PROTOCOL_PACKET_API_S_VER_1 */
-
-struct iwl_wowlan_remote_wake_config {
-       __le32 connection_max_time; /* unused */
-       /* TCP_PROTOCOL_CONFIG_API_S_VER_1 */
-       u8 max_syn_retries;
-       u8 max_data_retries;
-       u8 tcp_syn_ack_timeout;
-       u8 tcp_ack_timeout;
-
-       struct iwl_tcp_packet syn_tx;
-       struct iwl_tcp_packet synack_rx;
-       struct iwl_tcp_packet keepalive_ack_rx;
-       struct iwl_tcp_packet fin_tx;
-
-       struct iwl_remote_wake_packet keepalive_tx;
-       struct iwl_remote_wake_packet wake_rx;
-
-       /* REMOTE_WAKE_OFFSET_INFO_API_S_VER_1 */
-       u8 sequence_number_offset;
-       u8 sequence_number_length;
-       u8 token_offset;
-       u8 token_length;
-       /* REMOTE_WAKE_PROTOCOL_PARAMS_API_S_VER_1 */
-       __le32 initial_sequence_number;
-       __le16 keepalive_interval;
-       __le16 num_tokens;
-       u8 tokens[IWL_WOWLAN_REMOTE_WAKE_MAX_TOKENS];
-} __packed; /* REMOTE_WAKE_CONFIG_API_S_VER_2 */
-
 /* TODO: NetDetect API */
 
 #endif /* __iwl_fw_api_d3_h__ */

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index ebed82c590e56c8622358605a8aa235043dcdca4..af5688af9cfbccb3701d4d7467009c347f061b22 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -445,7 +445,6 @@ static const struct iwl_hcmd_names iwl_mvm_legacy_names[] = {
        HCMD_NAME(D3_CONFIG_CMD),
        HCMD_NAME(PROT_OFFLOAD_CONFIG_CMD),
        HCMD_NAME(OFFLOADS_QUERY_CMD),
-       HCMD_NAME(REMOTE_WAKE_CONFIG_CMD),
        HCMD_NAME(MATCH_FOUND_NOTIFICATION),
        HCMD_NAME(DTS_MEASUREMENT_NOTIFICATION),
        HCMD_NAME(WOWLAN_PATTERNS),