wifi: iwlwifi: mvm: remove support for iwl_wowlan_info_notif_v2

FWs with this version are no longer supported on any device.

Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250709230308.d92f63207232.I8961ffbe04d0d9439d48a17840497ac926967914@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h b/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h
index 99554496300a5250f585605eb897c577702e953c..3fd1a1b64b07f889b7a2adbe389e096c0d2a3719 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h
@@ -832,39 +832,6 @@ struct iwl_wowlan_info_notif_v1 {
        u8 reserved2[2];
 } __packed; /* WOWLAN_INFO_NTFY_API_S_VER_1 */
 
-/**
- * struct iwl_wowlan_info_notif_v2 - WoWLAN information notification
- * @gtk: GTK data
- * @igtk: IGTK data
- * @replay_ctr: GTK rekey replay counter
- * @pattern_number: number of the matched patterns
- * @reserved1: reserved
- * @qos_seq_ctr: QoS sequence counters to use next
- * @wakeup_reasons: wakeup reasons, see &enum iwl_wowlan_wakeup_reason
- * @num_of_gtk_rekeys: number of GTK rekeys
- * @transmitted_ndps: number of transmitted neighbor discovery packets
- * @received_beacons: number of received beacons
- * @tid_tear_down: bit mask of tids whose BA sessions were closed
- *     in suspend state
- * @station_id: station id
- * @reserved2: reserved
- */
-struct iwl_wowlan_info_notif_v2 {
-       struct iwl_wowlan_gtk_status_v3 gtk[WOWLAN_GTK_KEYS_NUM];
-       struct iwl_wowlan_igtk_status igtk[WOWLAN_IGTK_KEYS_NUM];
-       __le64 replay_ctr;
-       __le16 pattern_number;
-       __le16 reserved1;
-       __le16 qos_seq_ctr[8];
-       __le32 wakeup_reasons;
-       __le32 num_of_gtk_rekeys;
-       __le32 transmitted_ndps;
-       __le32 received_beacons;
-       u8 tid_tear_down;
-       u8 station_id;
-       u8 reserved2[2];
-} __packed; /* WOWLAN_INFO_NTFY_API_S_VER_2 */
-
 /* MAX MLO keys of non-active links that can arrive in the notification */
 #define WOWLAN_MAX_MLO_KEYS 18
 

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/offload.h b/drivers/net/wireless/intel/iwlwifi/fw/api/offload.h
index 9b09b835560b73913b73d3b7aa697a51cb9592ef..7d9aa8363f907f828b9199eee55cc03f38c3bd0f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/offload.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/offload.h
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Intel Corporation
  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH
  * Copyright (C) 2016-2017 Intel Deutschland GmbH
- * Copyright (C) 2021-2024 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  */
 #ifndef __iwl_fw_api_offload_h__
 #define __iwl_fw_api_offload_h__
@@ -19,8 +19,7 @@ enum iwl_prot_offload_subcmd_ids {
 
        /**
         * @WOWLAN_INFO_NOTIFICATION: Notification in
-        * &struct iwl_wowlan_info_notif_v1, &struct iwl_wowlan_info_notif_v2,
-        * or &struct iwl_wowlan_info_notif
+        * &struct iwl_wowlan_info_notif_v1, or &struct iwl_wowlan_info_notif
         */
        WOWLAN_INFO_NOTIFICATION = 0xFD,
 

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
index 66749dc38fc5d6706224cf17c3d844563c78c187..bc5f70f04d2ca1d791cd94f14142d0580ad1b6d5 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
@@ -2380,8 +2380,8 @@ iwl_mvm_parse_wowlan_info_notif_v3(struct iwl_mvm *mvm,
 }
 
 static void
-iwl_mvm_parse_wowlan_info_notif_v2(struct iwl_mvm *mvm,
-                                  struct iwl_wowlan_info_notif_v2 *data,
+iwl_mvm_parse_wowlan_info_notif_v1(struct iwl_mvm *mvm,
+                                  struct iwl_wowlan_info_notif_v1 *data,
                                   struct iwl_wowlan_status_data *status,
                                   u32 len)
 {
@@ -3097,29 +3097,11 @@ static bool iwl_mvm_wait_d3_notif(struct iwl_notif_wait_data *notif_wait,
                        break;
                }
 
-               if (wowlan_info_ver < 2) {
+               if (wowlan_info_ver == 1) {
                        struct iwl_wowlan_info_notif_v1 *notif_v1 =
                                (void *)pkt->data;
-                       struct iwl_wowlan_info_notif_v2 *notif_v2;
 
-                       notif_v2 = kmemdup(notif_v1, sizeof(*notif_v2), GFP_ATOMIC);
-
-                       if (!notif_v2)
-                               return false;
-
-                       notif_v2->tid_tear_down = notif_v1->tid_tear_down;
-                       notif_v2->station_id = notif_v1->station_id;
-                       memset_after(notif_v2, 0, station_id);
-                       iwl_mvm_parse_wowlan_info_notif_v2(mvm, notif_v2,
-                                                          d3_data->status,
-                                                          len);
-                       kfree(notif_v2);
-
-               } else if (wowlan_info_ver == 2) {
-                       struct iwl_wowlan_info_notif_v2 *notif_v2 =
-                               (void *)pkt->data;
-
-                       iwl_mvm_parse_wowlan_info_notif_v2(mvm, notif_v2,
+                       iwl_mvm_parse_wowlan_info_notif_v1(mvm, notif_v1,
                                                           d3_data->status,
                                                           len);
                } else if (wowlan_info_ver == 3) {