diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-07-17 09:23:20 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-20 04:16:40 +0300 |
| commit | 77d4df41d53e5c2af14db26f20fe50da52e382ba (patch) | |
| tree | 9766dd0cf5f7f14b96d65cb86e8138aaad104b50 /net/ipv6/ipv6_sockglue.c | |
| parent | fc66de8e16ec4d9b4d2696d961de4f81db78a1b6 (diff) | |
| download | linux-77d4df41d53e5c2af14db26f20fe50da52e382ba.tar.xz | |
netfilter: remove the compat_{get,set} methods
All instances handle compat sockopts via in_compat_syscall() now, so
remove the compat_{get,set} methods as well as the
compat_nf_{get,set}sockopt wrappers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ipv6_sockglue.c')
| -rw-r--r-- | net/ipv6/ipv6_sockglue.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index 6ab44ec2c369..6adfbdcb7979 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -1030,8 +1030,7 @@ mc_msf_out: /* we need to exclude all possible ENOPROTOOPTs except default case */ if (err == -ENOPROTOOPT && optname != IPV6_IPSEC_POLICY && optname != IPV6_XFRM_POLICY) - err = compat_nf_setsockopt(sk, PF_INET6, optname, optval, - optlen); + err = nf_setsockopt(sk, PF_INET6, optname, optval, optlen); #endif return err; } @@ -1531,7 +1530,7 @@ int compat_ipv6_getsockopt(struct sock *sk, int level, int optname, if (get_user(len, optlen)) return -EFAULT; - err = compat_nf_getsockopt(sk, PF_INET6, optname, optval, &len); + err = nf_getsockopt(sk, PF_INET6, optname, optval, &len); if (err >= 0) err = put_user(len, optlen); } |