6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima kuniyu@amazon.com
[ Upstream commit e263691773cd67d7c824eeee8b802f50c6e0c118 ]
__mptcp_init_sock() always returns 0 because mptcp_init_sock() used to return the value directly.
But after commit 18b683bff89d ("mptcp: queue data for mptcp level retransmission"), __mptcp_init_sock() need not return value anymore.
Let's remove the unnecessary test for __mptcp_init_sock() and make it return void.
Signed-off-by: Kuniyuki Iwashima kuniyu@amazon.com Reviewed-by: Matthieu Baerts matthieu.baerts@tessares.net Signed-off-by: Matthieu Baerts matthieu.baerts@tessares.net Signed-off-by: David S. Miller davem@davemloft.net Stable-dep-of: 27e5ccc2d5a5 ("mptcp: fix dangling connection hang-up") Signed-off-by: Sasha Levin sashal@kernel.org --- net/mptcp/protocol.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 6947b4b2519c9..0aae76f1465b8 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2710,7 +2710,7 @@ static void mptcp_worker(struct work_struct *work) sock_put(sk); }
-static int __mptcp_init_sock(struct sock *sk) +static void __mptcp_init_sock(struct sock *sk) { struct mptcp_sock *msk = mptcp_sk(sk);
@@ -2737,8 +2737,6 @@ static int __mptcp_init_sock(struct sock *sk) /* re-use the csk retrans timer for MPTCP-level retrans */ timer_setup(&msk->sk.icsk_retransmit_timer, mptcp_retransmit_timer, 0); timer_setup(&sk->sk_timer, mptcp_timeout_timer, 0); - - return 0; }
static void mptcp_ca_reset(struct sock *sk) @@ -2756,11 +2754,8 @@ static void mptcp_ca_reset(struct sock *sk) static int mptcp_init_sock(struct sock *sk) { struct net *net = sock_net(sk); - int ret;
- ret = __mptcp_init_sock(sk); - if (ret) - return ret; + __mptcp_init_sock(sk);
if (!mptcp_is_enabled(net)) return -ENOPROTOOPT;