From 29ff3f0271e2d3ca74cd077082aa7fda1ada0584 Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Thu, 28 Aug 2008 02:53:51 -0700 Subject: [PATCH] --- yaml --- r: 111259 b: refs/heads/master c: af01d537463714e36e2c96d2da35902b76cd6827 h: refs/heads/master i: 111257: 196716d4ff00b8ad53ede4cac437c6c72f9a21ac 111255: ff790e0d3efb8c932b5b30b8ef462644752d2157 v: v3 --- [refs] | 2 +- trunk/include/net/inet_connection_sock.h | 2 ++ trunk/include/net/sock.h | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 34ff3616a486..762da0094ccf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a627266570605a98c5fda5b8234d9e92015e4d14 +refs/heads/master: af01d537463714e36e2c96d2da35902b76cd6827 diff --git a/trunk/include/net/inet_connection_sock.h b/trunk/include/net/inet_connection_sock.h index 2ff545a56fb5..03cffd9f64e3 100644 --- a/trunk/include/net/inet_connection_sock.h +++ b/trunk/include/net/inet_connection_sock.h @@ -51,12 +51,14 @@ struct inet_connection_sock_af_ops { char __user *optval, int optlen); int (*getsockopt)(struct sock *sk, int level, int optname, char __user *optval, int __user *optlen); +#ifdef CONFIG_COMPAT int (*compat_setsockopt)(struct sock *sk, int level, int optname, char __user *optval, int optlen); int (*compat_getsockopt)(struct sock *sk, int level, int optname, char __user *optval, int __user *optlen); +#endif void (*addr2sockaddr)(struct sock *sk, struct sockaddr *); int (*bind_conflict)(const struct sock *sk, const struct inet_bind_bucket *tb); diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h index 06c5259aff30..75a312d3888a 100644 --- a/trunk/include/net/sock.h +++ b/trunk/include/net/sock.h @@ -532,6 +532,7 @@ struct proto { int (*getsockopt)(struct sock *sk, int level, int optname, char __user *optval, int __user *option); +#ifdef CONFIG_COMPAT int (*compat_setsockopt)(struct sock *sk, int level, int optname, char __user *optval, @@ -540,6 +541,7 @@ struct proto { int level, int optname, char __user *optval, int __user *option); +#endif int (*sendmsg)(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, size_t len); int (*recvmsg)(struct kiocb *iocb, struct sock *sk,