wifi: Remove invalid 128TU transition timeout constant

In Table 9-417m of 802.11be-2024, Transition Timeout is defined up
to value 10 for a Transition Timeout of 64TUs. The value 11 is reserved
and does not correspond to a Transition Timeout of 128TUs.

Signed-off-by: Pablo Martin-Gomez <pmartin-gomez@freebox.fr>
Link: https://patch.msgid.link/20260410170429.343617-2-pmartin-gomez@freebox.fr
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/iface.c b/drivers/net/wireless/intel/iwlwifi/mld/iface.c
index 52b2ae496811a0b04a02a9505e961ec4763bcc7e..1e85a9168d2b01ef5794f0dfbab694df3846beec 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mld/iface.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/iface.c
@@ -257,7 +257,7 @@ static void iwl_mld_fill_mac_cmd_sta(struct iwl_mld *mld,
                                     IEEE80211_EML_CAP_TRANSITION_TIMEOUT);
 
                cmd->client.esr_transition_timeout =
-                       min_t(u16, IEEE80211_EML_CAP_TRANSITION_TIMEOUT_128TU,
+                       min_t(u16, IEEE80211_EML_CAP_TRANSITION_TIMEOUT_64TU,
                              esr_transition_timeout);
                cmd->client.medium_sync_delay =
                        cpu_to_le16(vif->cfg.eml_med_sync_delay);

diff --git a/include/linux/ieee80211-eht.h b/include/linux/ieee80211-eht.h
index a97b1d01f3acf0f98f4c77a926ce190ee1ba2cff..bbff10a05b48cb656376a433a3884089359f3a57 100644 (file)
--- a/include/linux/ieee80211-eht.h
+++ b/include/linux/ieee80211-eht.h
@@ -517,7 +517,6 @@ struct ieee80211_multi_link_elem {
 #define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_16TU             8
 #define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_32TU             9
 #define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_64TU             10
-#define  IEEE80211_EML_CAP_TRANSITION_TIMEOUT_128TU            11
 
 #define IEEE80211_MLD_CAP_OP_MAX_SIMUL_LINKS           0x000f
 #define IEEE80211_MLD_CAP_OP_SRS_SUPPORT               0x0010
@@ -1178,7 +1177,7 @@ static inline u32 ieee80211_eml_trans_timeout_in_us(u16 eml_cap)
                                  IEEE80211_EML_CAP_TRANSITION_TIMEOUT);
 
        /* invalid values also just use 0 */
-       if (!timeout || timeout > IEEE80211_EML_CAP_TRANSITION_TIMEOUT_128TU)
+       if (!timeout || timeout > IEEE80211_EML_CAP_TRANSITION_TIMEOUT_64TU)
                return 0;
 
        return 128 * (1 << (timeout - 1));