[PATCH mptcp-net] mptcp: drop duplicate mptcp_setsockopt() declaration

[PATCH mptcp-net] mptcp: drop duplicate mptcp_setsockopt() declaration

[Paolo Abeni]

commit 7896248983ef ("mptcp: add skeleton to sync msk socket
options to subflows") introduced a duplicate declaration of
mptcp_setsockopt(), just drop it.

Reported-by: Florian Westphal <fw@strlen.de>
Fixes: 7896248983ef ("mptcp: add skeleton to sync msk socket options to subflows")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
 net/mptcp/protocol.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 2480db50cbd2..fce3f34800ff 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -783,9 +783,6 @@ unsigned int mptcp_pm_get_add_addr_accept_max(struct mptcp_sock *msk);
 unsigned int mptcp_pm_get_subflows_max(struct mptcp_sock *msk);
 unsigned int mptcp_pm_get_local_addr_max(struct mptcp_sock *msk);
 
-int mptcp_setsockopt(struct sock *sk, int level, int optname,
-		     sockptr_t optval, unsigned int optlen);
-
 void mptcp_sockopt_sync(struct mptcp_sock *msk, struct sock *ssk);
 void mptcp_sockopt_sync_all(struct mptcp_sock *msk);
 
-- 
2.26.3

Re: [PATCH mptcp-net] mptcp: drop duplicate mptcp_setsockopt() declaration

[Mat Martineau]

On Fri, 18 Jun 2021, Paolo Abeni wrote:

> commit 7896248983ef ("mptcp: add skeleton to sync msk socket
> options to subflows") introduced a duplicate declaration of
> mptcp_setsockopt(), just drop it.
>
> Reported-by: Florian Westphal <fw@strlen.de>
> Fixes: 7896248983ef ("mptcp: add skeleton to sync msk socket options to subflows")
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> ---
> net/mptcp/protocol.h | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
> index 2480db50cbd2..fce3f34800ff 100644
> --- a/net/mptcp/protocol.h
> +++ b/net/mptcp/protocol.h
> @@ -783,9 +783,6 @@ unsigned int mptcp_pm_get_add_addr_accept_max(struct mptcp_sock *msk);
> unsigned int mptcp_pm_get_subflows_max(struct mptcp_sock *msk);
> unsigned int mptcp_pm_get_local_addr_max(struct mptcp_sock *msk);
>
> -int mptcp_setsockopt(struct sock *sk, int level, int optname,
> -		     sockptr_t optval, unsigned int optlen);
> -
> void mptcp_sockopt_sync(struct mptcp_sock *msk, struct sock *ssk);
> void mptcp_sockopt_sync_all(struct mptcp_sock *msk);
>
> -- 
> 2.26.3

Thanks Paolo.

Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>

--
Mat Martineau
Intel

Re: [PATCH mptcp-net] mptcp: drop duplicate mptcp_setsockopt() declaration

[Matthieu Baerts]

Hi Paolo, Florian, Mat,

On 18/06/2021 19:56, Paolo Abeni wrote:
> commit 7896248983ef ("mptcp: add skeleton to sync msk socket
> options to subflows") introduced a duplicate declaration of
> mptcp_setsockopt(), just drop it.
> 
> Reported-by: Florian Westphal <fw@strlen.de>
> Fixes: 7896248983ef ("mptcp: add skeleton to sync msk socket options to subflows")
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>

Thank you for the report, the patch and the review!

Now in our tree -- fixes for net -- with Mat's RvB tag:

- 2c55fe95b0ee: mptcp: drop duplicate mptcp_setsockopt() declaration
- Results: 43a335a6d44d..eb9ae196ed3a

Builds and tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20210619T070741
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export/20210619T070741

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net