46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From 135074416baed33c7e855827cf2d93d7fcb6d057 Mon Sep 17 00:00:00 2001
|
|
From: Geliang Tang <tanggeliang@kylinos.cn>
|
|
Date: Fri, 15 Aug 2025 19:28:22 +0200
|
|
Subject: mptcp: remove duplicate sk_reset_timer call
|
|
|
|
sk_reset_timer() was called twice in mptcp_pm_alloc_anno_list.
|
|
|
|
Simplify the code by using a 'goto' statement to eliminate the
|
|
duplication.
|
|
|
|
Note that this is not a fix, but it will help backporting the following
|
|
patch. The same "Fixes" tag has been added for this reason.
|
|
|
|
Fixes: 93f323b9cccc ("mptcp: add a new sysctl add_addr_timeout")
|
|
Cc: stable@vger.kernel.org
|
|
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
|
|
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
|
|
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
|
|
Link: https://patch.msgid.link/20250815-net-mptcp-misc-fixes-6-17-rc2-v1-4-521fe9957892@kernel.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
net/mptcp/pm.c | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
--- a/net/mptcp/pm.c
|
|
+++ b/net/mptcp/pm.c
|
|
@@ -353,9 +353,7 @@ bool mptcp_pm_alloc_anno_list(struct mpt
|
|
if (WARN_ON_ONCE(mptcp_pm_is_kernel(msk)))
|
|
return false;
|
|
|
|
- sk_reset_timer(sk, &add_entry->add_timer,
|
|
- jiffies + mptcp_get_add_addr_timeout(net));
|
|
- return true;
|
|
+ goto reset_timer;
|
|
}
|
|
|
|
add_entry = kmalloc(sizeof(*add_entry), GFP_ATOMIC);
|
|
@@ -369,6 +367,7 @@ bool mptcp_pm_alloc_anno_list(struct mpt
|
|
add_entry->retrans_times = 0;
|
|
|
|
timer_setup(&add_entry->add_timer, mptcp_pm_add_timer, 0);
|
|
+reset_timer:
|
|
sk_reset_timer(sk, &add_entry->add_timer,
|
|
jiffies + mptcp_get_add_addr_timeout(net));
|
|
|