Commit af01d537 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

net: more #ifdef CONFIG_COMPAT 



All users of struct proto::compat_[gs]etsockopt and
struct inet_connection_sock_af_ops::compat_[gs]etsockopt are under
#ifdef already, so use it in structure definition too.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a6272665

include/net/inet_connection_sock.h

+2 −0
Original line number Diff line number Diff line
@@ -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);

include/net/sock.h

+2 −0
Original line number Diff line number Diff line
@@ -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,