mptcp.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
From: Mat Martineau <mathew.j.martineau@linux.intel.com>
To: Paolo Abeni <pabeni@redhat.com>
Cc: mptcp@lists.linux.dev
Subject: Re: [PATCH mptcp-net] mptcp: drop duplicate mptcp_setsockopt() declaration
Date: Fri, 18 Jun 2021 13:58:50 -0700 (PDT)	[thread overview]
Message-ID: <c0c8623-72eb-1d0-f4d4-7a9229307a71@linux.intel.com> (raw)
In-Reply-To: <c3038e2051a4b0a718e868b9129b5c6ecc682fef.1624038975.git.pabeni@redhat.com>

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

  reply	other threads:[~2021-06-18 20:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-18 17:56 Paolo Abeni
2021-06-18 20:58 ` Mat Martineau [this message]
2021-06-19  7:07 ` Matthieu Baerts

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c0c8623-72eb-1d0-f4d4-7a9229307a71@linux.intel.com \
    --to=mathew.j.martineau@linux.intel.com \
    --cc=mptcp@lists.linux.dev \
    --cc=pabeni@redhat.com \
    --subject='Re: [PATCH mptcp-net] mptcp: drop duplicate mptcp_setsockopt() declaration' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).