From: Emmanuel Grumbach Date: Tue, 12 May 2026 05:22:54 +0000 (+0300) Subject: wifi: iwlwifi: rename iwl_system_statistics_notif_oper X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de04c81d4811496bd9c375bec44c2e984218be9a;p=thirdparty%2Fkernel%2Flinux.git wifi: iwlwifi: rename iwl_system_statistics_notif_oper rename iwl_system_statistics_notif_oper to iwl_system_statistics_notif_oper_v3 since v4 is on the way. Same for iwl_stats_ntfy_per_phy, since v2 is on the way. Signed-off-by: Emmanuel Grumbach Link: https://patch.msgid.link/20260512082114.2c3b55b1cae7.Ic982845bfe08c7c9ea16c267570e3e3856de84b8@changeid Signed-off-by: Miri Korenblit --- diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h index 36159a7699167..dcac0ba8cccf9 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h @@ -2,7 +2,7 @@ /* * Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2022, 2024-2025 Intel Corporation + * Copyright (C) 2018-2022, 2024-2026 Intel Corporation */ #ifndef __iwl_fw_api_commands_h__ #define __iwl_fw_api_commands_h__ @@ -653,7 +653,7 @@ enum iwl_system_subcmd_ids { enum iwl_statistics_subcmd_ids { /** * @STATISTICS_OPER_NOTIF: Notification about operational - * statistics &struct iwl_system_statistics_notif_oper + * statistics &struct iwl_system_statistics_notif_oper_v3 */ STATISTICS_OPER_NOTIF = 0x0, diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/stats.h b/drivers/net/wireless/intel/iwlwifi/fw/api/stats.h index 68983f6a00266..8d734512f4d56 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/api/stats.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/api/stats.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ /* - * Copyright (C) 2012-2014, 2018, 2020-2021, 2023-2025 Intel Corporation + * Copyright (C) 2012-2014, 2018, 2020-2021, 2023-2026 Intel Corporation * Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH */ @@ -557,7 +557,7 @@ struct iwl_stats_ntfy_per_mac { #define IWL_STATS_MAX_BW_INDEX 5 /** - * struct iwl_stats_ntfy_per_phy - per PHY statistics + * struct iwl_stats_ntfy_per_phy_v1 - per PHY statistics * @channel_load: channel load * @channel_load_by_us: device contribution to MCLM * @channel_load_not_by_us: other devices' contribution to MCLM @@ -572,7 +572,7 @@ struct iwl_stats_ntfy_per_mac { * per channel BW. note BACK counted as 1 * @last_tx_ch_width_indx: last txed frame channel width index */ -struct iwl_stats_ntfy_per_phy { +struct iwl_stats_ntfy_per_phy_v1 { __le32 channel_load; __le32 channel_load_by_us; __le32 channel_load_not_by_us; @@ -600,17 +600,17 @@ struct iwl_stats_ntfy_per_sta { #define IWL_STATS_MAX_PHY_OPERATIONAL 3 /** - * struct iwl_system_statistics_notif_oper - statistics notification + * struct iwl_system_statistics_notif_oper_v3 - statistics notification * * @time_stamp: time when the notification is sent from firmware * @per_link: per link statistics, &struct iwl_stats_ntfy_per_link - * @per_phy: per phy statistics, &struct iwl_stats_ntfy_per_phy + * @per_phy: per phy statistics, &struct iwl_stats_ntfy_per_phy_v1 * @per_sta: per sta statistics, &struct iwl_stats_ntfy_per_sta */ -struct iwl_system_statistics_notif_oper { +struct iwl_system_statistics_notif_oper_v3 { __le32 time_stamp; struct iwl_stats_ntfy_per_link per_link[IWL_FW_MAX_LINKS]; - struct iwl_stats_ntfy_per_phy per_phy[IWL_STATS_MAX_PHY_OPERATIONAL]; + struct iwl_stats_ntfy_per_phy_v1 per_phy[IWL_STATS_MAX_PHY_OPERATIONAL]; struct iwl_stats_ntfy_per_sta per_sta[IWL_STATION_COUNT_MAX]; } __packed; /* STATISTICS_FW_NTFY_OPERATIONAL_API_S_VER_3 */ @@ -642,7 +642,7 @@ struct iwl_system_statistics_end_notif { * @hdr: general statistics header * @flags: bitmap of possible notification structures * @per_mac: per mac statistics, &struct iwl_stats_ntfy_per_mac - * @per_phy: per phy statistics, &struct iwl_stats_ntfy_per_phy + * @per_phy: per phy statistics, &struct iwl_stats_ntfy_per_phy_v1 * @per_sta: per sta statistics, &struct iwl_stats_ntfy_per_sta * @rx_time: rx time * @tx_time: usec the radio is transmitting. @@ -653,7 +653,7 @@ struct iwl_statistics_operational_ntfy { struct iwl_statistics_ntfy_hdr hdr; __le32 flags; struct iwl_stats_ntfy_per_mac per_mac[MAC_INDEX_AUX]; - struct iwl_stats_ntfy_per_phy per_phy[IWL_STATS_MAX_PHY_OPERATIONAL]; + struct iwl_stats_ntfy_per_phy_v1 per_phy[IWL_STATS_MAX_PHY_OPERATIONAL]; struct iwl_stats_ntfy_per_sta per_sta[IWL_STATION_COUNT_MAX]; __le64 rx_time; __le64 tx_time; diff --git a/drivers/net/wireless/intel/iwlwifi/mld/notif.c b/drivers/net/wireless/intel/iwlwifi/mld/notif.c index 9c88a8579a759..f7aeff61d7855 100644 --- a/drivers/net/wireless/intel/iwlwifi/mld/notif.c +++ b/drivers/net/wireless/intel/iwlwifi/mld/notif.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2024-2025 Intel Corporation + * Copyright (C) 2024-2026 Intel Corporation */ #include "mld.h" @@ -330,7 +330,7 @@ CMD_VERSIONS(probe_resp_data_notif, CMD_VERSIONS(datapath_monitor_notif, CMD_VER_ENTRY(1, iwl_datapath_monitor_notif)) CMD_VERSIONS(stats_oper_notif, - CMD_VER_ENTRY(3, iwl_system_statistics_notif_oper)) + CMD_VER_ENTRY(3, iwl_system_statistics_notif_oper_v3)) CMD_VERSIONS(stats_oper_part1_notif, CMD_VER_ENTRY(4, iwl_system_statistics_part1_notif_oper)) CMD_VERSIONS(bt_coex_notif, diff --git a/drivers/net/wireless/intel/iwlwifi/mld/stats.c b/drivers/net/wireless/intel/iwlwifi/mld/stats.c index 54eb0ead78eee..714d66324e9f4 100644 --- a/drivers/net/wireless/intel/iwlwifi/mld/stats.c +++ b/drivers/net/wireless/intel/iwlwifi/mld/stats.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2024-2025 Intel Corporation + * Copyright (C) 2024-2026 Intel Corporation */ #include "mld.h" @@ -40,7 +40,7 @@ iwl_mld_fill_stats_from_oper_notif(struct iwl_mld *mld, struct iwl_rx_packet *pkt, u8 fw_sta_id, struct station_info *sinfo) { - const struct iwl_system_statistics_notif_oper *notif = + const struct iwl_system_statistics_notif_oper_v3 *notif = (void *)&pkt->data; const struct iwl_stats_ntfy_per_sta *per_sta = ¬if->per_sta[fw_sta_id]; @@ -483,7 +483,7 @@ static void iwl_mld_fill_chanctx_stats(struct ieee80211_hw *hw, void *data) { struct iwl_mld_phy *phy = iwl_mld_phy_from_mac80211(ctx); - const struct iwl_stats_ntfy_per_phy *per_phy = data; + const struct iwl_stats_ntfy_per_phy_v1 *per_phy = data; u32 new_load, old_load; if (WARN_ON(phy->fw_id >= IWL_STATS_MAX_PHY_OPERATIONAL)) @@ -512,7 +512,7 @@ static void iwl_mld_fill_chanctx_stats(struct ieee80211_hw *hw, static void iwl_mld_process_per_phy_stats(struct iwl_mld *mld, - const struct iwl_stats_ntfy_per_phy *per_phy) + const struct iwl_stats_ntfy_per_phy_v1 *per_phy) { ieee80211_iter_chan_contexts_mtx(mld->hw, iwl_mld_fill_chanctx_stats, @@ -523,7 +523,7 @@ iwl_mld_process_per_phy_stats(struct iwl_mld *mld, void iwl_mld_handle_stats_oper_notif(struct iwl_mld *mld, struct iwl_rx_packet *pkt) { - const struct iwl_system_statistics_notif_oper *stats = + const struct iwl_system_statistics_notif_oper_v3 *stats = (void *)&pkt->data; u32 curr_ts_usec = le32_to_cpu(stats->time_stamp); diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c index ae177477b2012..726477336bb4f 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2012-2014, 2018-2025 Intel Corporation + * Copyright (C) 2012-2014, 2018-2026 Intel Corporation * Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH */ @@ -335,7 +335,7 @@ static const struct iwl_rx_handlers iwl_mvm_rx_handlers[] = { RX_HANDLER_GRP(STATISTICS_GROUP, STATISTICS_OPER_NOTIF, iwl_mvm_handle_rx_system_oper_stats, RX_HANDLER_ASYNC_LOCKED_WIPHY, - struct iwl_system_statistics_notif_oper), + struct iwl_system_statistics_notif_oper_v3), RX_HANDLER_GRP(STATISTICS_GROUP, STATISTICS_OPER_PART1_NOTIF, iwl_mvm_handle_rx_system_oper_part1_stats, RX_HANDLER_ASYNC_LOCKED, diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c index d0c0faae01221..269c4b45de807 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2012-2014, 2018-2025 Intel Corporation + * Copyright (C) 2012-2014, 2018-2026 Intel Corporation * Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH */ @@ -757,8 +757,9 @@ iwl_mvm_update_tcm_from_stats(struct iwl_mvm *mvm, __le32 *air_time_le, spin_unlock(&mvm->tcm.lock); } -static void iwl_mvm_handle_per_phy_stats(struct iwl_mvm *mvm, - struct iwl_stats_ntfy_per_phy *per_phy) +static void +iwl_mvm_handle_per_phy_stats(struct iwl_mvm *mvm, + struct iwl_stats_ntfy_per_phy_v1 *per_phy) { int i; @@ -937,7 +938,7 @@ void iwl_mvm_handle_rx_system_oper_stats(struct iwl_mvm *mvm, { u8 average_energy[IWL_STATION_COUNT_MAX]; struct iwl_rx_packet *pkt = rxb_addr(rxb); - struct iwl_system_statistics_notif_oper *stats; + struct iwl_system_statistics_notif_oper_v3 *stats; int i; u32 notif_ver = iwl_fw_lookup_notif_ver(mvm->fw, STATISTICS_GROUP, STATISTICS_OPER_NOTIF, 0);