wifi: iwlwifi: mvm: rename iwl_missed_beacons_notif

A new version is coming up. Rename the current struct to include the
current version.

s/iwl_missed_beacons_notif/iwl_missed_beacons_notif_v4

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20240808232017.b5c3a83a05ef.I698611582b5ca8395f42a535c51f7230307e2c6f@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
index 377fac2785115ca4b5c34487d0ab368070f80900..852ea5d14051313857e2a8bfb69247d965c200b0 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
@@ -401,7 +401,7 @@ enum iwl_legacy_cmds {
        REDUCE_TX_POWER_CMD = 0x9f,
 
        /**
-        * @MISSED_BEACONS_NOTIFICATION: &struct iwl_missed_beacons_notif
+        * @MISSED_BEACONS_NOTIFICATION: &struct iwl_missed_beacons_notif_v4
         */
        MISSED_BEACONS_NOTIFICATION = 0xa2,
 

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/mac.h b/drivers/net/wireless/intel/iwlwifi/fw/api/mac.h
index bcbbf8c4a29743bb8c5111f78ebc36bca0d08f2f..490215e71e5d66c6fcf59245146efc3d959ab508 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/mac.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/mac.h
@@ -378,7 +378,7 @@ struct iwl_missed_beacons_notif_ver_3 {
 } __packed; /* MISSED_BEACON_NTFY_API_S_VER_3 */
 
 /**
- * struct iwl_missed_beacons_notif - information on missed beacons
+ * struct iwl_missed_beacons_notif_v4 - information on missed beacons
  * ( MISSED_BEACONS_NOTIFICATION = 0xa2 )
  * @link_id: fw link ID
  * @consec_missed_beacons_since_last_rx: number of consecutive missed
@@ -387,7 +387,7 @@ struct iwl_missed_beacons_notif_ver_3 {
  * @num_expected_beacons: number of expected beacons
  * @num_recvd_beacons: number of received beacons
  */
-struct iwl_missed_beacons_notif {
+struct iwl_missed_beacons_notif_v4 {
        __le32 link_id;
        __le32 consec_missed_beacons_since_last_rx;
        __le32 consec_missed_beacons;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
index dfcc96f18b4f7ce63239c7d04ccbffae91bdcc46..9209814b465c7644d2eb3cda5adb72d6c54237a2 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -1590,7 +1590,7 @@ void iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,
                                     struct iwl_rx_cmd_buffer *rxb)
 {
        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-       struct iwl_missed_beacons_notif *mb = (void *)pkt->data;
+       struct iwl_missed_beacons_notif_v4 *mb = (void *)pkt->data;
        struct iwl_fw_dbg_trigger_missed_bcon *bcon_trig;
        struct iwl_fw_dbg_trigger_tlv *trigger;
        u32 stop_trig_missed_bcon, stop_trig_missed_bcon_since_rx;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index be20c8e3a389a1f139e55acf7d5de989bd55306d..dd2631ff452d3ca2bb387ccd0349d44e70f618a0 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -396,7 +396,7 @@ static const struct iwl_rx_handlers iwl_mvm_rx_handlers[] = {
 
        RX_HANDLER(MISSED_BEACONS_NOTIFICATION, iwl_mvm_rx_missed_beacons_notif,
                   RX_HANDLER_ASYNC_LOCKED_WIPHY,
-                  struct iwl_missed_beacons_notif),
+                  struct iwl_missed_beacons_notif_v4),
 
        RX_HANDLER(REPLY_ERROR, iwl_mvm_rx_fw_error, RX_HANDLER_SYNC,
                   struct iwl_error_resp),