Commit a7476267 authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

mptcp: avoid some duplicate code in socket option handling 



The mptcp_get_int_option() helper is needless open-coded in a
couple of places, replace the duplicate code with the helper
call.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 037db6ea

net/mptcp/sockopt.c

+8 −12
Original line number Diff line number Diff line
@@ -629,13 +629,11 @@ static int mptcp_setsockopt_sol_tcp_cork(struct mptcp_sock *msk, sockptr_t optva 
{

	struct mptcp_subflow_context *subflow;

	struct sock *sk = (struct sock *)msk;

	int val;



	if (optlen < sizeof(int))

		return -EINVAL;

	int val, ret;



	if (copy_from_sockptr(&val, optval, sizeof(val)))

		return -EFAULT;

	ret = mptcp_get_int_option(msk, optval, optlen, &val);

	if (ret)

		return ret;



	lock_sock(sk);

	sockopt_seq_inc(msk);
@@ -659,13 +657,11 @@ static int mptcp_setsockopt_sol_tcp_nodelay(struct mptcp_sock *msk, sockptr_t op 
{

	struct mptcp_subflow_context *subflow;

	struct sock *sk = (struct sock *)msk;

	int val;



	if (optlen < sizeof(int))

		return -EINVAL;

	int val, ret;



	if (copy_from_sockptr(&val, optval, sizeof(val)))

		return -EFAULT;

	ret = mptcp_get_int_option(msk, optval, optlen, &val);

	if (ret)

		return ret;



	lock_sock(sk);

	sockopt_seq_inc(msk);