aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/sock.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-07-17 08:23:30 +0200
committerDavid S. Miller <davem@davemloft.net>2020-07-19 18:16:41 -0700
commit3021ad529950d07e0408d65d0f1df00454c1d223 (patch)
tree04d93530056da3b208b58aa0e570a08d66e6e04a /net/core/sock.c
parentfdf5bdd87c01571f3256a799bdc217e7cca35fbd (diff)
downloadlinux-3021ad529950d07e0408d65d0f1df00454c1d223.tar.gz
net/ipv6: remove compat_ipv6_{get,set}sockopt
Handle the few cases that need special treatment in-line using in_compat_syscall(). This also removes all the now unused compat_{get,set}sockopt methods. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock.c')
-rw-r--r--net/core/sock.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index 018404d1762682..48655d5c4cf37a 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -3199,11 +3199,6 @@ int sock_common_getsockopt(struct socket *sock, int level, int optname,
{
struct sock *sk = sock->sk;
-#ifdef CONFIG_COMPAT
- if (in_compat_syscal() && sk->sk_prot->compat_getsockopt)
- return sk->sk_prot->compat_getsockopt(sk, level, optname,
- optval, optlen);
-#endif
return sk->sk_prot->getsockopt(sk, level, optname, optval, optlen);
}
EXPORT_SYMBOL(sock_common_getsockopt);
@@ -3231,11 +3226,6 @@ int sock_common_setsockopt(struct socket *sock, int level, int optname,
{
struct sock *sk = sock->sk;
-#ifdef CONFIG_COMPAT
- if (in_compat_syscall() && sk->sk_prot->compat_setsockopt)
- return sk->sk_prot->compat_setsockopt(sk, level, optname,
- optval, optlen);
-#endif
return sk->sk_prot->setsockopt(sk, level, optname, optval, optlen);
}
EXPORT_SYMBOL(sock_common_setsockopt);