]> www.infradead.org Git - users/jedix/linux-maple.git/commit
mptcp: remove duplicate sk_reset_timer call
authorGeliang Tang <tanggeliang@kylinos.cn>
Fri, 15 Aug 2025 17:28:22 +0000 (19:28 +0200)
committerJakub Kicinski <kuba@kernel.org>
Tue, 19 Aug 2025 00:39:58 +0000 (17:39 -0700)
commit5d13349472ac8abcbcb94407969aa0fdc2e1f1be
tree23231642f0bf714201a4f5b9efe6f4330f3010ae
parent452690be7de2f91cc0de68cb9e95252875b33503
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