Re: [PATCH mptcp-net] mptcp: pm: reset retrans_time when ADD_ADDR entry is reused

On Wed, 5 Aug 2026, Matthieu Baerts (NGI0) wrote:

> 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")
> Link: https://netdev-ai.bots.linux.dev/sashiko/#/patchset/20260803-net-mptcp-misc-fixes-7-2-rc6-v2-0-b8f496d71664%40kernel.org?part=4
> Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>
> ---
> net/mptcp/pm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
> index 5e499ec1c50a..e46abbda7d27 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)
>
> ---
> base-commit: 0715f5ba093a581def25b88da61c987b1719bc6d
> change-id: 20260805-mptcp-pm-reset-retrans_time-8894830b0bd7

Looks good to me, thanks for the fix.

Reviewed-by: Mat Martineau <[email protected]>