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=1794273046; b=seKH1weJhOwQTfb77Izg+I/O3bekRz2MYDvlhMuXMByEyyk2aI6tsZx1wpOn15miz7an IX6E0FMA1J9fPvBS5Pe5zPgP4NDOx9G3GOd+U6UinSWzxR4O4Hio1No3cfH6C220PTaut IYHRW9HdM8jYQBcbADO0qaUws6S3215a9pfLa+Y0dr/ax2iyCtvZ3JywJ7cQ5aowepEtj EXSj53wk5upCno6TLGKRTI+b4tiy6H2kL3PrVlNJ/1ynF08P+T7e60NyiqRVfoE3iLZKq gSOVWvmMyqxdcxnt2SuZ7LKkDf2kTby6q9nhMswhfi3FLdYvj91MRX6a8Bq16P9ABxw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794273046; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=yKu5/xLhyze1xQWPB90z7RSLvOCkhd2PH6JMta4Qh4U=; b=Evk9ZID+eDx1lS7CgJFh/EFu/RGrJG4uQtQBytOj1N904EIt/fknGU3iaQ2hZk4KQ342 dJYB9WeuQufJB9MEcdLIgXYHngz1UQ91zd31UBqra6uKL69HATIQuDfnscv3IjMDn/9ep YWQ+oeUXdMPxsSmPsWIx2/isiUzZh+COruUlkWy1x5f+9eJc0l63C/v4Bcc6GNyq+O8k+ bo7y8qyg+GikF/RB+m78UnZKTfSRSPmJKCtwu7qHUdk6EE5W1Zomnyse+UAJKHAN/qj05 iO+JyJsm5X7tUDsqNRCL6V4OMvPJP27EqZB/zQHvGTcQh2wfKsRXKVcUsnKiy7Awl2Q== 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=dPeDTtM1; 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 B0CFF606A31C for ; Tue, 10 Nov 2026 01:10:45 +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=dPeDTtM1 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37DDC1F0089F; Tue, 10 Nov 2026 01:10:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794273045; bh=yKu5/xLhyze1xQWPB90z7RSLvOCkhd2PH6JMta4Qh4U=; h=From:To:Cc:Subject:Date; b=dPeDTtM1nQgjA6XtYeoqAU7C2iawms5wMRdq05xpdHA36iLr5bZvSYRgNXQMJhznI ppj9H8FsHOIWASKz2TLyV7MRg3uSDaj9wxm+N1HQcDT9sO11RGlvDqBqobvLC6ruzd elG07/clRcM3a5lXxczOSaZZkqgU73FR2eBq8JzTUtITJQrLj5KDq0lFnuIeWvv9sm TdfdC0oQ16dydvDQZ64RSW6xT3B8NQ3B10MI7G3oBYWZNLlrHwXbSdZzj8B9S3pmMf ckgjpE5YKpCek4JLhoSsixOz9/zvlnC7LGRKawVBPFCBlkKsu05Ujq/IBOzo4zRuCt 2UxKugdV2QrMg== From: Sasha Levin To: sven@narfation.org Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] batman-adv: tt: clear ROAM flag when re-adding a pending local client" failed to apply to 6.6-stable tree Date: Mon, 9 Nov 2026 20:10:44 -0500 Message-ID: <20261109201044-failed-6.6-cc2186d78547@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 cc2186d7854785b30d423f5d43757b086b300e55 # git commit -s git send-email --to '' --in-reply-to '20261109201044-failed-6.6-cc2186d78547@kernel.org' --subject-prefix 'PATCH 6.6.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From cc2186d7854785b30d423f5d43757b086b300e55 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Wed, 7 Oct 2026 13:02:45 +0200 Subject: [PATCH] batman-adv: tt: clear ROAM flag when re-adding a pending local client When a ROAMING_ADV is received for an announced local client, batadv_tt_local_mark_removed() sets BATADV_TT_CLIENT_ROAM, queues a DEL|ROAM change and marks the entry as BATADV_TT_CLIENT_PENDING. If the client sends a frame again before the next TTVN commit, batadv_tt_local_add_existing() only clears the PENDING flag and returns early. The ADD cancels the queued DEL, but the entry keeps the ROAM flag: * batadv_is_my_client() reports the client as not served by this node * batadv_tt_local_client_is_roaming() reroutes unicast frames for it to the node which sent the ROAMING_ADV The ROAM flag is only removed with the next frame of the client. Since BATADV_TT_CLIENT_ROAM is set together with BATADV_TT_CLIENT_PENDING, it has to be cleared also at the same time with BATADV_TT_CLIENT_PENDING when the client roamed back. Cc: stable@vger.kernel.org Fixes: 068ee6e204e1 ("batman-adv: roaming handling mechanism redesign") Signed-off-by: Sven Eckelmann --- net/batman-adv/translation-table.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 39b61426f1680..e13c2828da475 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -894,6 +894,7 @@ static bool batadv_tt_local_add_existing(struct batadv_priv *bat_priv, bool *roamed_back) { struct batadv_tt_common_entry *common = &tt_local->common; + bool readded = false; tt_local->last_seen = jiffies; @@ -908,8 +909,7 @@ static bool batadv_tt_local_add_existing(struct batadv_priv *bat_priv, * flag can be reset like it was never enqueued */ common->flags &= ~BATADV_TT_CLIENT_PENDING; - - return true; + readded = true; } if (common->flags & BATADV_TT_CLIENT_ROAM) { @@ -926,7 +926,7 @@ static bool batadv_tt_local_add_existing(struct batadv_priv *bat_priv, } } - return false; + return readded; } /** -- 2.53.0