From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mathieu Malaterre Subject: [PATCH] =?UTF-8?q?net:=20move=20=E2=80=98=5F=5Fzerocopy=5Fsg=5Ffr?= =?UTF-8?q?om=5Fiter=E2=80=99=20prototype=20to=20header=20file=20?= Date: Wed, 31 Oct 2018 12:34:59 +0100 Message-ID: <20181031113500.3763-1-malat@debian.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Mathieu Malaterre , linux-kernel@vger.kernel.org, netdev@vger.kernel.org To: davem@davemloft.net Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org This makes it clear the function is part of the API. Also this will remove a warning triggered at W=1: net/core/datagram.c:581:5: warning: no previous prototype for ‘__zerocopy_sg_from_iter’ [-Wmissing-prototypes] Signed-off-by: Mathieu Malaterre --- include/linux/skbuff.h | 2 ++ net/core/skbuff.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 0ba687454267..cca7c0a3c176 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -3311,6 +3311,8 @@ int skb_copy_and_csum_datagram_msg(struct sk_buff *skb, int hlen, struct msghdr *msg); int skb_copy_datagram_from_iter(struct sk_buff *skb, int offset, struct iov_iter *from, int len); +int __zerocopy_sg_from_iter(struct sock *sk, struct sk_buff *skb, + struct iov_iter *from, size_t length); int zerocopy_sg_from_iter(struct sk_buff *skb, struct iov_iter *frm); void skb_free_datagram(struct sock *sk, struct sk_buff *skb); void __skb_free_datagram_locked(struct sock *sk, struct sk_buff *skb, int len); diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 946de0e24c87..7eb7e0e104d4 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1102,9 +1102,6 @@ void sock_zerocopy_put_abort(struct ubuf_info *uarg) } EXPORT_SYMBOL_GPL(sock_zerocopy_put_abort); -extern int __zerocopy_sg_from_iter(struct sock *sk, struct sk_buff *skb, - struct iov_iter *from, size_t length); - int skb_zerocopy_iter_stream(struct sock *sk, struct sk_buff *skb, struct msghdr *msg, int len, struct ubuf_info *uarg) -- 2.11.0