wifi: iwlwifi: align the name of iwl_alive_ntf_v6 to the convention

This struct rperesent versions 6 and 7. The convention is to name an API
struct with the last version it represent, so rename to
iwl_alive_ntf_v7.

Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250915113137.81240e1d4df3.I2c1264a49b9f0fc160f960cf3c5dc4cedf6ceb6d@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/alive.h b/drivers/net/wireless/intel/iwlwifi/fw/api/alive.h
index ad5b95cad0bf701b9412b542596437a1d02e3fbc..ea2ba4b4cb7b059b27c52b509789aaf954b7a6ac 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/alive.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/alive.h
@@ -88,7 +88,7 @@ struct iwl_imr_alive_info {
        __le32 enabled;
 } __packed; /* IMR_ALIVE_INFO_API_S_VER_1 */
 
-struct iwl_alive_ntf_v6 {
+struct iwl_alive_ntf_v7 {
        __le16 status;
        __le16 flags;
        struct iwl_lmac_alive lmac_data[2];

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
index 997b0c9ce9840852b3d710bb436be63d917eb3c0..8d64a271bb9452a1fbb5d50ded2b29269606181b 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
@@ -60,7 +60,7 @@ enum iwl_legacy_cmds {
         * @UCODE_ALIVE_NTFY:
         * Alive data from the firmware, as described in
         * &struct iwl_alive_ntf_v3 or &struct iwl_alive_ntf_v4 or
-        * &struct iwl_alive_ntf_v5 or &struct iwl_alive_ntf_v6.
+        * &struct iwl_alive_ntf_v5 or &struct iwl_alive_ntf_v7.
         */
        UCODE_ALIVE_NTFY = 0x1,
 

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/fw.c b/drivers/net/wireless/intel/iwlwifi/mld/fw.c
index b372173c4a79548695afc1d2e3765d111377376d..bdb69c098fd147879fd842882106ca8234753f7b 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mld/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/fw.c
@@ -126,7 +126,7 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,
        switch (version) {
        case 6:
        case 7:
-               expected_sz = sizeof(struct iwl_alive_ntf_v6);
+               expected_sz = sizeof(struct iwl_alive_ntf_v7);
                break;
        case 8:
                expected_sz = sizeof(struct iwl_alive_ntf);

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 865f973f677dbae2f3537169cc5077c3795e217f..6b76ce35443d2040b8bd99fe6f1815de5de1d4d0 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -115,7 +115,7 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,
 
 
        if (version >= 6) {
-               struct iwl_alive_ntf_v6 *palive;
+               struct iwl_alive_ntf_v7 *palive;
 
                if (pkt_len < sizeof(*palive))
                        return false;