This command is sent in other opmodes as well. Remove the mvm prefix. Signed-off-by: Miri Korenblit --- .../net/wireless/intel/iwlwifi/fw/api/commands.h | 4 ++-- .../net/wireless/intel/iwlwifi/fw/api/debug.h | 16 ++++++++-------- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h index abd259350589..f76f76e54c4e 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h @@ -466,8 +466,8 @@ enum iwl_legacy_cmds { MCC_CHUB_UPDATE_CMD = 0xc9, /** - * @MARKER_CMD: trace marker command, uses &struct iwl_mvm_marker - * with &struct iwl_mvm_marker_rsp + * @MARKER_CMD: trace marker command, uses &struct iwl_marker + * with &struct iwl_marker_rsp */ MARKER_CMD = 0xcb, diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h b/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h index 61a850de26fc..382d1c2581ad 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ /* - * Copyright (C) 2005-2014, 2018-2025 Intel Corporation + * Copyright (C) 2005-2014, 2018-2026 Intel Corporation * Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH */ @@ -262,20 +262,20 @@ struct iwl_mfu_assert_dump_notif { } __packed; /* MFU_DUMP_ASSERT_API_S_VER_1 */ /** - * enum iwl_mvm_marker_id - marker ids + * enum iwl_marker_id - marker ids * * The ids for different type of markers to insert into the usniffer logs * * @MARKER_ID_TX_FRAME_LATENCY: TX latency marker * @MARKER_ID_SYNC_CLOCK: sync FW time and systime */ -enum iwl_mvm_marker_id { +enum iwl_marker_id { MARKER_ID_TX_FRAME_LATENCY = 1, MARKER_ID_SYNC_CLOCK = 2, }; /* MARKER_ID_API_E_VER_2 */ /** - * struct iwl_mvm_marker - mark info into the usniffer logs + * struct iwl_marker - mark info into the usniffer logs * * (MARKER_CMD = 0xcb) * @@ -284,12 +284,12 @@ enum iwl_mvm_marker_id { * In the command response the ucode will return the GP2 time. * * @dw_len: The amount of dwords following this byte including this byte. - * @marker_id: A unique marker id (iwl_mvm_marker_id). + * @marker_id: A unique marker id (iwl_marker_id). * @reserved: reserved. * @timestamp: in milliseconds since 1970-01-01 00:00:00 UTC * @metadata: additional meta data that will be written to the unsiffer log */ -struct iwl_mvm_marker { +struct iwl_marker { u8 dw_len; u8 marker_id; __le16 reserved; @@ -298,11 +298,11 @@ struct iwl_mvm_marker { } __packed; /* MARKER_API_S_VER_1 */ /** - * struct iwl_mvm_marker_rsp - Response to marker cmd + * struct iwl_marker_rsp - Response to marker cmd * * @gp2: The gp2 clock value in the FW */ -struct iwl_mvm_marker_rsp { +struct iwl_marker_rsp { __le32 gp2; } __packed; diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c index 337e312c2f43..6621ef9358bc 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c @@ -2383,8 +2383,8 @@ static int iwl_fw_dbg_restart_recording(struct iwl_trans *trans, int iwl_fw_send_timestamp_marker_cmd(struct iwl_fw_runtime *fwrt) { - struct iwl_mvm_marker marker = { - .dw_len = sizeof(struct iwl_mvm_marker) / 4, + struct iwl_marker marker = { + .dw_len = sizeof(struct iwl_marker) / 4, .marker_id = MARKER_ID_SYNC_CLOCK, }; struct iwl_host_cmd hcmd = { @@ -2392,7 +2392,7 @@ int iwl_fw_send_timestamp_marker_cmd(struct iwl_fw_runtime *fwrt) .id = WIDE_ID(LONG_GROUP, MARKER_CMD), .dataflags = {}, }; - struct iwl_mvm_marker_rsp *resp; + struct iwl_marker_rsp *resp; int cmd_ver = iwl_fw_lookup_cmd_ver(fwrt->fw, WIDE_ID(LONG_GROUP, MARKER_CMD), IWL_FW_CMD_VER_UNKNOWN); -- 2.34.1