From mboxrd@z Thu Jan 1 00:00:00 1970 From: YueHaibing Subject: [PATCH bpf-next] bpfilter: Fix mismatch in function argument types Date: Thu, 19 Jul 2018 15:25:56 +0800 Message-ID: <20180719072556.20076-1-yuehaibing@huawei.com> Mime-Version: 1.0 Content-Type: text/plain Cc: , , YueHaibing To: , Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Fix following warning: net/ipv4/bpfilter/sockopt.c:28:5: error: symbol 'bpfilter_ip_set_sockopt' redeclared with different type net/ipv4/bpfilter/sockopt.c:34:5: error: symbol 'bpfilter_ip_get_sockopt' redeclared with different type Signed-off-by: YueHaibing --- include/linux/bpfilter.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/bpfilter.h b/include/linux/bpfilter.h index 687b176..43acfa8 100644 --- a/include/linux/bpfilter.h +++ b/include/linux/bpfilter.h @@ -5,9 +5,9 @@ #include struct sock; -int bpfilter_ip_set_sockopt(struct sock *sk, int optname, char *optval, +int bpfilter_ip_set_sockopt(struct sock *sk, int optname, char __user *optval, unsigned int optlen); -int bpfilter_ip_get_sockopt(struct sock *sk, int optname, char *optval, +int bpfilter_ip_get_sockopt(struct sock *sk, int optname, char __user *optval, int *optlen); extern int (*bpfilter_process_sockopt)(struct sock *sk, int optname, char __user *optval, -- 2.7.0