From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794273039; b=pR7UIsa+8XY0XCE8WAnRabWV5dt9CZZkH4jDEqRszmt08TYToXqhVgub0v+N2WOrn0sQ syjmRON35bGOQtprA71ce8YOWMxzlfx+8v81CVdbOBb3HgVU6D4fHcTdOiaN07cQc2GVi nudoOf04UhpuynTx4noP261RbX3pxg7jNuL21AhcCUCerFCTg8kKiUbM0f3gXRdHBNi+a SU+N86wldUJf/oblfTHlnFcJu/+ZW9nQ9XEIMZkGFCiPI+LjT/6g+t2yLSPYS64Pb45ZH sD/Q2ewaWyOvkFOYyK2NOnmLScH9QGpnZeYuzw29PP0cNlZ6qVBj1H/ewA+FvmGJ6fQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794273039; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=RTAujotiFQJ2xPExbIurvQlak6LNpJteMuAds6yCxU8=; b=qm9VSuCYaprx1GC1A5kIFJfq3zF+sy8i18YILbmUSOakXlbUy+mnfRjV0ThdTlbfIK4s GlkSZkqXIoZp6hxPoFq8HzZ8p1epv+6f0BmmvPHS4P5wzDPQ1qlOyOQnWLUf6PrzMLLTa 0Jgb3+b3lM1EI8qjGrP2MCFcgG+9yBsi1DPeqHqtQcwkSs4ZH1DoT+05pdRym2lCzFFlI 5vGjH4gPtUk7jyX02XrwRA22ewC5fxwGNCvjj6Guw3OV3YLiC0zgsOtpSgDYf70JR4DuR Tw/v0tmoU5USIvw31U/ERQ1YLHwJHYbLnasBlRKlj9XzVmxbxEGu5YRCsa0wn4iuH3Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=cJwl03mO; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 18941606A31C for ; Tue, 10 Nov 2026 01:10:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=cJwl03mO Received: by smtp.kernel.org (Postfix) with ESMTPSA id 966CB1F0089F; Tue, 10 Nov 2026 01:10:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794273039; bh=RTAujotiFQJ2xPExbIurvQlak6LNpJteMuAds6yCxU8=; h=From:To:Cc:Subject:Date; b=cJwl03mOWeSdzli+E6qEKEpiZO8JEEF0IGi1nXcaLJHY4tfETB9Kk37J4N9E9HLJj BeDHP43z5vQts5C/KLKmv3aKI755uvvXlJq+joy8I3Bq8QVdVnHPHD1O+eNb5cZ4+H 6M6lCYRYfzGGdhKXGvoHRXNoimNW3gvUtEdYEZupVYdQad4yMBlu7TBbKeZG2tyEak NEW5DP0KGr9KBUp5DASiMksaQmMTCRfTJhJnUWsZHGWkWCnJFtw48yrCA6TXB/KtHD rndVBtAiGJy8DO+6sCcwMshCJCwqjTmxVS/BHnCvdXHAXwQTcDsyLjRxZDs/4SjFO7 cA/kps7iLzwkA== From: Sasha Levin To: sven@narfation.org Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] batman-adv: tt: send ROAM_ADV on each roamed back client" failed to apply to 6.6-stable tree Date: Mon, 9 Nov 2026 20:10:37 -0500 Message-ID: <20261109201037-failed-6.6-aff4d5d10f2d@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x aff4d5d10f2dcb4a9b604e27414dafa1d51b6406 # git commit -s git send-email --to '' --in-reply-to '20261109201037-failed-6.6-aff4d5d10f2d@kernel.org' --subject-prefix 'PATCH 6.6.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From aff4d5d10f2dcb4a9b604e27414dafa1d51b6406 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Thu, 8 Oct 2026 12:00:27 +0200 Subject: [PATCH] batman-adv: tt: send ROAM_ADV on each roamed back client When a ROAMING_ADV is received for an announced local client, batadv_roam_tvlv_unicast_handler_v1() creates a global entry with the BATADV_TT_CLIENT_ROAM flag set. If the client sends a frame again before the next TTVN commit, batadv_tt_local_add_roam() is expected to announce this return via a ROAM_ADV frame. But this doesn't happen because the global entry (created by the first ROAMING_ADV) carries BATADV_TT_CLIENT_ROAM until the new originator announces the client. Let batadv_tt_local_add_roam() always handle a roamed back client - independent of the ROAM flag of the global entry: * trigger sending of the ROAM_ADV frame(s) * remove the (with the roaming) associated global entry Cc: stable@vger.kernel.org Fixes: 068ee6e204e1 ("batman-adv: roaming handling mechanism redesign") Signed-off-by: Sven Eckelmann --- net/batman-adv/translation-table.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index e13c2828da475..0df51523dcf0c 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -819,14 +819,21 @@ static void batadv_tt_local_add_roam(struct batadv_priv *bat_priv, if (!tt_global) return; - /* Check whether it is a roaming, but don't do anything if the roaming - * process has already been handled + /* Handle newly roamed client - but not roamed back client. + * + * A client which roamed back must always be reclaimed from the + * originator(s) which sent the ROAMING_ADV. The global entry created by + * this ROAMING_ADV might still carry BATADV_TT_CLIENT_ROAM because the + * new originator did not yet announce the client. */ - scoped_guard(spinlock_bh, &tt_global->common.flags_lock) { - if (tt_global->common.flags & BATADV_TT_CLIENT_ROAM) - return; + if (!roamed_back) { + scoped_guard(spinlock_bh, &tt_global->common.flags_lock) { + /* Check whether it is a roaming, but don't do anything + * if the roaming process has already been handled. + */ + if (tt_global->common.flags & BATADV_TT_CLIENT_ROAM) + return; - if (!roamed_back) { /* The global entry has to be marked as ROAMING and has to be * kept for consistency purpose. * -- 2.53.0