Commit e1fc9288 authored by Miri Korenblit's avatar Miri Korenblit Committed by Johannes Berg
Browse files

wifi: iwlwifi: remove mvm prefix from iwl_mvm_esr_mode_notif 



This is not specific to mvm.

Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250212073923.c536eeaae129.I848307be6df21913c0ce3eb6baef715cd401db1a@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 79c06299

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

+2 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */

/*

 * Copyright (C) 2024 Intel Corporation

 * Copyright (C) 2024-2025 Intel Corporation

 * Copyright (C) 2012-2014, 2018-2022 Intel Corporation

 * Copyright (C) 2013-2015 Intel Mobile Communications GmbH

 * Copyright (C) 2016-2017 Intel Deutschland GmbH
@@ -92,7 +92,7 @@ enum iwl_data_path_subcmd_ids { 


	/**

	 * @ESR_MODE_NOTIF: notification to recommend/force a wanted esr mode,

	 *	uses &struct iwl_mvm_esr_mode_notif

	 *	uses &struct iwl_esr_mode_notif

	 */

	ESR_MODE_NOTIF = 0xF3,

drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h

+2 −2
Original line number Diff line number Diff line
@@ -697,11 +697,11 @@ enum iwl_mvm_fw_esr_recommendation { 
}; /* ESR_MODE_RECOMMENDATION_CODE_API_E_VER_1 */



/**

 * struct iwl_mvm_esr_mode_notif - FWs recommendation/force for esr mode

 * struct iwl_esr_mode_notif - FWs recommendation/force for esr mode

 *

 * @action: the action to apply on esr state. See &iwl_mvm_fw_esr_recommendation

 */

struct iwl_mvm_esr_mode_notif {

struct iwl_esr_mode_notif {

	__le32 action;

} __packed; /* ESR_MODE_RECOMMENDATION_NTFY_API_S_VER_1 */

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

+3 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

/*

 * Copyright (C) 2012-2014, 2018-2024 Intel Corporation

 * Copyright (C) 2012-2014, 2018-2025 Intel Corporation

 * Copyright (C) 2013-2015 Intel Mobile Communications GmbH

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 */
@@ -145,7 +145,7 @@ static void iwl_mvm_rx_esr_mode_notif(struct iwl_mvm *mvm, 
				      struct iwl_rx_cmd_buffer *rxb)

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct iwl_mvm_esr_mode_notif *notif = (void *)pkt->data;

	struct iwl_esr_mode_notif *notif = (void *)pkt->data;

	struct ieee80211_vif *vif = iwl_mvm_get_bss_vif(mvm);



	/* FW recommendations is only for entering EMLSR */
@@ -495,7 +495,7 @@ static const struct iwl_rx_handlers iwl_mvm_rx_handlers[] = { 
	RX_HANDLER_GRP(DATA_PATH_GROUP, ESR_MODE_NOTIF,

		       iwl_mvm_rx_esr_mode_notif,

		       RX_HANDLER_ASYNC_LOCKED_WIPHY,

		       struct iwl_mvm_esr_mode_notif),

		       struct iwl_esr_mode_notif),



	RX_HANDLER_GRP(DATA_PATH_GROUP, MONITOR_NOTIF,

		       iwl_mvm_rx_monitor_notif, RX_HANDLER_ASYNC_LOCKED,