Commit e2636917 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by David S. Miller
Browse files

mptcp: Remove unnecessary test for __mptcp_init_sock() 



__mptcp_init_sock() always returns 0 because mptcp_init_sock() used
to return the value directly.

But after commit 18b683bf ("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: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 39880bd8

net/mptcp/protocol.c

+2 −7
Original line number Diff line number Diff line
@@ -2649,7 +2649,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);
@@ -2676,8 +2676,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)
@@ -2695,11 +2693,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;