From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pieter Smith Subject: [PATCH 53/56] net/ipv6: support compiling out splice Date: Thu, 13 Nov 2014 22:23:30 +0100 Message-ID: <1415913813-362-54-git-send-email-pieter@boesman.nl> References: <1415913813-362-1-git-send-email-pieter@boesman.nl> Cc: Josh Triplett , "David S. Miller" , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy , netdev@vger.kernel.org (open list:NETWORKING [IPv4/...), linux-kernel@vger.kernel.org (open list) To: pieter@boesman.nl Return-path: In-Reply-To: <1415913813-362-1-git-send-email-pieter@boesman.nl> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Compile out splice support from ipv6 networking when the splice-family of syscalls is not supported by the system (i.e. CONFIG_SYSCALL_SPLICE is undefined). Signed-off-by: Pieter Smith --- net/ipv6/af_inet6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 2daa3a1..3d17064 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -523,7 +523,7 @@ const struct proto_ops inet6_stream_ops = { .recvmsg = inet_recvmsg, /* ok */ .mmap = sock_no_mmap, .sendpage = inet_sendpage, - .splice_read = tcp_splice_read, + SPLICE_READ_INIT(tcp_splice_read) #ifdef CONFIG_COMPAT .compat_setsockopt = compat_sock_common_setsockopt, .compat_getsockopt = compat_sock_common_getsockopt, -- 1.9.1