All of
 help / color / mirror / Atom feed
From: Johannes Berg <>
Cc: Johannes Berg <>,
	Ilan Peer <>,
	Miriam Rachel Korenblit <>
Subject: [PATCH wireless 7/8] wifi: mac80211: remove link before AP
Date: Thu, 18 Apr 2024 10:52:25 +0200	[thread overview]
Message-ID: <20240418105220.03ac4a09fa74.Ifb8c8d38e3402721a81ce5981568f47b5c5889cb@changeid> (raw)
In-Reply-To: <20240418105220.90df97557702.I05d2228ce85c203b9f2d6da8538cc16dce46752a@changeid>

From: Johannes Berg <>

If the AP removal timer is long, we don't really want to
remove the link immediately. However, we really should do
it _before_ the AP removes it (which happens at or after
count reaches 0), so subtract 1 from the countdown when
scheduling the timer. This causes the link removal work
to run just after the beacon with value 1 is received. If
the counter is already zero, do it immediately.

This fixes an issue where we do the removal too late and
receive a beacon from the AP that's no longer associated
with the MLD, but thus removed EHT and ML elements, and
then we disconnect instead from the whole MLD, since one
of the associated APs changed mode from EHT to HE.

Fixes: 8eb8dd2ffbbb ("wifi: mac80211: Support link removal using Reconfiguration ML element")
Reviewed-by: Ilan Peer <>
Reviewed-by: Miriam Rachel Korenblit <>
Signed-off-by: Johannes Berg <>
 net/mac80211/mlme.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 502c34d52fbe..6f0880ec89da 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -5844,8 +5844,11 @@ static void ieee80211_ml_reconfiguration(struct ieee80211_sub_if_data *sdata,
-		link_delay = link_conf->beacon_int *
-			link_removal_timeout[link_id];
+		if (link_removal_timeout[link_id] < 1)
+			link_delay = 0;
+		else
+			link_delay = link_conf->beacon_int *
+				(link_removal_timeout[link_id] - 1);
 		if (!delay)
 			delay = link_delay;

  parent reply	other threads:[~2024-04-18  8:52 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-18  8:52 [PATCH wireless 1/8] wifi: mac80211: fix idle calculation with multi-link Johannes Berg
2024-04-18  8:52 ` [PATCH wireless 2/8] wifi: mac80211: mlme: re-parse with correct mode Johannes Berg
2024-04-18  8:52 ` [PATCH wireless 3/8] wifi: mac80211: mlme: fix memory leak Johannes Berg
2024-04-18  8:52 ` [PATCH wireless 4/8] wifi: mac80211: mlme: re-parse if AP mode is less than client Johannes Berg
2024-04-18  8:52 ` [PATCH wireless 5/8] wifi: nl80211: don't free NULL coalescing rule Johannes Berg
2024-04-18  8:52 ` [PATCH wireless 6/8] wifi: mac80211_hwsim: init peer measurement result Johannes Berg
2024-04-18  8:52 ` Johannes Berg [this message]
2024-04-18  8:52 ` [PATCH wireless 8/8] wifi: mac80211: fix unaligned le16 access Johannes Berg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240418105220.03ac4a09fa74.Ifb8c8d38e3402721a81ce5981568f47b5c5889cb@changeid \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.