From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 15E1349B46B for ; Wed, 16 Sep 2026 16:34:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789576482; cv=none; b=ly1foyOxlqg6oh8BrOeIs+ROTEjO0qqiUDgnah61xgIxt040qAt1XfBcehiNOMIMxFpIQS5zPN+mOr2A1zrh5r4I36Zg2Jx50yjB6+0A8cmm0ehbM46GxOETMV/TUiJtePpYSQXtD56nUG3JbDNIj263X55iSv4/6SEsWUhXUYM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789576482; c=relaxed/simple; bh=nXFvsgX5lwnJAwmDiIuoEspfYA0Hk3YUDDa2TVk6jxc=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=k8V9MqwlWbdBpjdeDP/sFCiqwHIU8Lcce9Vrm9PvhYTUe2ofw3dLeOGcZwscs733pGMZahZya+moQCQnNhrvvKzIjY7hypZfN5NUVBS/7mOG0xgm//qJkRCV9LCteDLXayTx1ESQJrAm/r+yV6Z/YD+IxmtiXUx31MBI/8MZvBU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ngvwAZc+; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ngvwAZc+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5F9EF1F000FF; Wed, 16 Sep 2026 16:34:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789576481; bh=q63+ZGsaUh8Q+9ZMCDIXE207Y8UofMeKQoC1Fz7sfw4=; h=Subject:To:Cc:From:Date; b=ngvwAZc+I5f3u1gK4o3MX8Q7CImKZwKKfG7oLOT09yFN4HznEJ5Yr98Z4qXO8mj9a 2EUeA3jfjZGzXR0p+0uV+/vyt27JuljguumRlQN4UDkB7iRGYQT7Vje1YDMMpMPKaE 3HSZb9x4Wt6tBbkwwDnjy8FqVWfDRrVqdZs7Fqz0= Subject: FAILED: patch "[PATCH] mptcp: pm: reset retrans_time when ADD_ADDR entry is reused" failed to apply to 6.1-stable tree To: matttbe@kernel.org,kuba@kernel.org,martineau@kernel.org Cc: From: Date: Wed, 16 Sep 2026 17:31:15 +0100 Message-ID: <2026091615-twisty-extenuate-7c8b@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-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.1.y git checkout FETCH_HEAD git cherry-pick -x f968190c0b42ea2004dc1426359a53ec365a7a37 # git commit -s git send-email --to '' --in-reply-to '2026091615-twisty-extenuate-7c8b@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From f968190c0b42ea2004dc1426359a53ec365a7a37 Mon Sep 17 00:00:00 2001 From: "Matthieu Baerts (NGI0)" Date: Tue, 8 Sep 2026 16:07:14 +0200 Subject: [PATCH] mptcp: pm: reset retrans_time when ADD_ADDR entry is reused When an ADD_ADDR entry is reused, the timer is re-armed, because the goal is to re-announce an ADD_ADDR, and eventually retransmit it if needed. In this case, the retransmission counter should be reset as well, so the re-announced address gets its retransmissions back instead of relying on what was left before, and possibly not being able to retransmit it. Fixes: 304ab97f4c7c ("mptcp: allow ADD_ADDR reissuance by userspace PMs") Cc: stable@vger.kernel.org Link: https://netdev-ai.bots.linux.dev/sashiko/#/patchset/20260803-net-mptcp-misc-fixes-7-2-rc6-v2-0-b8f496d71664%40kernel.org?part=4 Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260908-net-mptcp-misc-fixes-7-3-rc1-v2-9-df1de70348b6@kernel.org Signed-off-by: Jakub Kicinski diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 8b68868255c5..b0b71adefb8f 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -462,10 +462,10 @@ bool mptcp_pm_announced_alloc(struct mptcp_sock *msk, add_entry->addr = *addr; add_entry->sock = msk; - add_entry->retrans_times = 0; timer_setup(&add_entry->timer, mptcp_pm_add_addr_timer, 0); reset_timer: + add_entry->retrans_times = 0; add_entry->timer_done = false; timeout = mptcp_adjust_add_addr_timeout(msk); if (timeout)