diff options
| author |   YueHaibing <yuehaibing@huawei.com> | 2018-07-19 15:56:59 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-07-21 16:21:25 -0700 |
| commit | f95de8aa9f824d96421cb7ca81552b4ad8768a31 (patch) | |
| tree | c7aeab7d9902a7f613abdd092f87ac36580408c3 /include/linux/bpfilter.h | |
| parent | net: phy: consider PHY_IGNORE_INTERRUPT in phy_start_aneg_priv (diff) | |
| download | wireguard-linux-f95de8aa9f824d96421cb7ca81552b4ad8768a31.tar.xz wireguard-linux-f95de8aa9f824d96421cb7ca81552b4ad8768a31.zip | |
bpfilter: Fix mismatch in function argument types
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 <yuehaibing@huawei.com>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/bpfilter.h')
| -rw-r--r-- | include/linux/bpfilter.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/bpfilter.h b/include/linux/bpfilter.h index 687b1760bb9f..f02cee0225d4 100644 --- a/include/linux/bpfilter.h +++ b/include/linux/bpfilter.h @@ -5,10 +5,10 @@ #include <uapi/linux/bpfilter.h> 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 *optlen); +int bpfilter_ip_get_sockopt(struct sock *sk, int optname, char __user *optval, + int __user *optlen); extern int (*bpfilter_process_sockopt)(struct sock *sk, int optname, char __user *optval, unsigned int optlen, bool is_set); |