Commit 55e52a3b authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

wifi: iwlwifi: remove the version number from iwl_dts_measurement_notif_v2 



No need to carry the version number in the structure name if this is the
latest version available.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250119210104.9d218a5c4f6b.I9de3e424be48d66994cde3684ce7e9e99456067d@changeid


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

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

+1 −1
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ enum iwl_legacy_cmds { 
	/**

	 * @DTS_MEASUREMENT_NOTIFICATION:

	 * &struct iwl_dts_measurement_notif_v1 or

	 * &struct iwl_dts_measurement_notif_v2

	 * &struct iwl_dts_measurement_notif

	 */

	DTS_MEASUREMENT_NOTIFICATION = 0xdd,

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

+3 −3
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ enum iwl_phy_ops_subcmd_ids { 
	/**

	 * @DTS_MEASUREMENT_NOTIF_WIDE:

	 * &struct iwl_dts_measurement_notif_v1 or

	 * &struct iwl_dts_measurement_notif_v2

	 * &struct iwl_dts_measurement_notif

	 */

	DTS_MEASUREMENT_NOTIF_WIDE = 0xFF,

};
@@ -152,13 +152,13 @@ struct iwl_dts_measurement_notif_v1 { 
} __packed; /* TEMPERATURE_MEASUREMENT_TRIGGER_NTFY_S_VER_1*/



/**

 * struct iwl_dts_measurement_notif_v2 - measurements notification

 * struct iwl_dts_measurement_notif - measurements notification

 *

 * @temp: the measured temperature

 * @voltage: the measured voltage

 * @threshold_idx: the trip index that was crossed

 */

struct iwl_dts_measurement_notif_v2 {

struct iwl_dts_measurement_notif {

	__le32 temp;

	__le32 voltage;

	__le32 threshold_idx;

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

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static bool iwl_mvm_temp_notif_wait(struct iwl_notif_wait_data *notif_wait, 
void iwl_mvm_temp_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct iwl_dts_measurement_notif_v2 *notif_v2;

	struct iwl_dts_measurement_notif *notif_v2;

	int len = iwl_rx_packet_payload_len(pkt);

	int temp;

	u32 ths_crossed;