wifi: iwlwifi: mvm: remove support for iwl_wowlan_status_v9

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.22864efb5074.I51f270f8848970fd2ca1078c14ad31f4a8853e7d@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
index 3f8f9e3fcba8d7525152c72ea2356da51cc6a234..997b0c9ce9840852b3d710bb436be63d917eb3c0 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
@@ -573,8 +573,8 @@ enum iwl_legacy_cmds {
        WOWLAN_KEK_KCK_MATERIAL = 0xe4,
 
        /**
-        * @WOWLAN_GET_STATUSES: response in &struct iwl_wowlan_status_v6,
-        *      &struct iwl_wowlan_status_v7, &struct iwl_wowlan_status_v9
+        * @WOWLAN_GET_STATUSES: response in &struct iwl_wowlan_status_v6 or
+        *      &struct iwl_wowlan_status_v7
         */
        WOWLAN_GET_STATUSES = 0xe5,
 

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h b/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h
index a73b1f63da1c3839b9a058a3bce3cc90981a0e6c..b16bd8aa136a10d29292217156023b7b7a3418e3 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h
@@ -719,44 +719,6 @@ struct iwl_wowlan_status_v7 {
        u8 wake_packet[]; /* can be truncated from _length to _bufsize */
 } __packed; /* WOWLAN_STATUSES_API_S_VER_7 */
 
-/**
- * struct iwl_wowlan_status_v9 - WoWLAN status (versions 9 and 10)
- * @gtk: GTK data
- * @igtk: IGTK data
- * @replay_ctr: GTK rekey replay counter
- * @pattern_number: number of the matched pattern
- * @non_qos_seq_ctr: non-QoS sequence counter to use next.
- *                   Reserved if the struct has version >= 10.
- * @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
- * @wake_packet_length: wakeup packet length
- * @wake_packet_bufsize: wakeup packet buffer size
- * @tid_tear_down: bit mask of tids whose BA sessions were closed
- *                in suspend state
- * @reserved: unused
- * @wake_packet: wakeup packet
- */
-struct iwl_wowlan_status_v9 {
-       struct iwl_wowlan_gtk_status_v2 gtk[WOWLAN_GTK_KEYS_NUM];
-       struct iwl_wowlan_igtk_status igtk[WOWLAN_IGTK_KEYS_NUM];
-       __le64 replay_ctr;
-       __le16 pattern_number;
-       __le16 non_qos_seq_ctr;
-       __le16 qos_seq_ctr[8];
-       __le32 wakeup_reasons;
-       __le32 num_of_gtk_rekeys;
-       __le32 transmitted_ndps;
-       __le32 received_beacons;
-       __le32 wake_packet_length;
-       __le32 wake_packet_bufsize;
-       u8 tid_tear_down;
-       u8 reserved[3];
-       u8 wake_packet[]; /* can be truncated from _length to _bufsize */
-} __packed; /* WOWLAN_STATUSES_RSP_API_S_VER_9 */
-
 /**
  * struct iwl_wowlan_info_notif_v1 - WoWLAN information notification
  * @gtk: GTK data

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
index 36890e9c7a2fe771fa1c7285d2e97aa5cbd688d3..d9d678fbdaabe7dcc963dcc215053b8fe7ca8a41 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
@@ -2466,7 +2466,6 @@ iwl_mvm_parse_wowlan_status_common_ ## _ver(struct iwl_mvm *mvm,  \
 
 iwl_mvm_parse_wowlan_status_common(v6)
 iwl_mvm_parse_wowlan_status_common(v7)
-iwl_mvm_parse_wowlan_status_common(v9)
 
 static struct iwl_wowlan_status_data *
 iwl_mvm_send_wowlan_get_status(struct iwl_mvm *mvm, u8 sta_id)
@@ -2543,21 +2542,6 @@ iwl_mvm_send_wowlan_get_status(struct iwl_mvm *mvm, u8 sta_id)
                iwl_mvm_convert_key_counters(status, &v7->gtk[0].rsc.all_tsc_rsc);
                iwl_mvm_convert_gtk_v2(status, &v7->gtk[0]);
                iwl_mvm_convert_igtk(status, &v7->igtk[0]);
-       } else if (notif_ver == 9 || notif_ver == 10 || notif_ver == 11) {
-               struct iwl_wowlan_status_v9 *v9 = (void *)cmd.resp_pkt->data;
-
-               /* these three command versions have same layout and size, the
-                * difference is only in a few not used (reserved) fields.
-                */
-               status = iwl_mvm_parse_wowlan_status_common_v9(mvm, v9, len);
-               if (!status)
-                       goto out_free_resp;
-
-               iwl_mvm_convert_key_counters(status, &v9->gtk[0].rsc.all_tsc_rsc);
-               iwl_mvm_convert_gtk_v2(status, &v9->gtk[0]);
-               iwl_mvm_convert_igtk(status, &v9->igtk[0]);
-
-               status->tid_tear_down = v9->tid_tear_down;
        } else {
                IWL_ERR(mvm,
                        "Firmware advertises unknown WoWLAN status response %d!\n",