Patch "wifi: mac80211: fix the comeback long retry times" has been added to the 6.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    wifi: mac80211: fix the comeback long retry times

to the 6.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     wifi-mac80211-fix-the-comeback-long-retry-times.patch
and it can be found in the queue-6.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 9cc8d3baaee705c02b933fa5bea818aa388fe75b
Author: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
Date:   Thu Aug 8 11:59:16 2024 +0300

    wifi: mac80211: fix the comeback long retry times
    
    [ Upstream commit 1524173a3745899612c71d9e83ff8fe29dbb2cfb ]
    
    When we had a comeback, we will never use the default timeout values
    again because comeback is never cleared.
    Clear comeback if we send another association request which will allow
    to start a default timer after Tx status.
    
    The problem was seen with iwlwifi where the tx_status on the association
    request is handled before the association response frame (which is the
    usual case).
    
    1) Tx assoc request 1/3
    2) Rx assoc response (comeback, timeout = 1 second)
    3) wait 1 second
    4) Tx assoc request 2/3
    5) Set timer to IEEE80211_ASSOC_TIMEOUT_LONG = 500ms (1 second after
       round_up)
    6) tx_status on frame sent in 4) is ignored because comeback is still
       true
    7) AP does not reply with assoc response
    8) wait 1s <= This is where the bug is felt
    9) Tx assoc request 3/3
    
    With this fix, in step 6 we will reset the timer to
    IEEE80211_ASSOC_TIMEOUT_SHORT = 100ms and we will wait only 100ms in
    step 8.
    
    Fixes: b133fdf07db8 ("wifi: mac80211: Skip association timeout update after comeback rejection")
    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
    Link: https://patch.msgid.link/20240808085916.23519-1-emmanuel.grumbach@xxxxxxxxx
    Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index ad2ce9c92ba8a..51b00ff7edf15 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -7121,6 +7121,7 @@ static int ieee80211_do_assoc(struct ieee80211_sub_if_data *sdata)
 	lockdep_assert_wiphy(sdata->local->hw.wiphy);
 
 	assoc_data->tries++;
+	assoc_data->comeback = false;
 	if (assoc_data->tries > IEEE80211_ASSOC_MAX_TRIES) {
 		sdata_info(sdata, "association with %pM timed out\n",
 			   assoc_data->ap_addr);