Commit 3021ad52 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fdf5bdd8

include/net/inet_connection_sock.h

+0 −13
Original line number Diff line number Diff line
@@ -48,14 +48,6 @@ struct inet_connection_sock_af_ops { 
				  char __user *optval, unsigned 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, unsigned 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 *);

	void	    (*mtu_reduced)(struct sock *sk);

};
@@ -311,11 +303,6 @@ void inet_csk_listen_stop(struct sock *sk); 


void inet_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr);



int inet_csk_compat_getsockopt(struct sock *sk, int level, int optname,

			       char __user *optval, int __user *optlen);

int inet_csk_compat_setsockopt(struct sock *sk, int level, int optname,

			       char __user *optval, unsigned int optlen);



struct dst_entry *inet_csk_update_pmtu(struct sock *sk, u32 mtu);



#define TCP_PINGPONG_THRESH	3

include/net/ipv6.h

+0 −4
Original line number Diff line number Diff line
@@ -1088,10 +1088,6 @@ int ipv6_setsockopt(struct sock *sk, int level, int optname, 
		    char __user *optval, unsigned int optlen);

int ipv6_getsockopt(struct sock *sk, int level, int optname,

		    char __user *optval, int __user *optlen);

int compat_ipv6_setsockopt(struct sock *sk, int level, int optname,

			   char __user *optval, unsigned int optlen);

int compat_ipv6_getsockopt(struct sock *sk, int level, int optname,

			   char __user *optval, int __user *optlen);



int __ip6_datagram_connect(struct sock *sk, struct sockaddr *addr,

			   int addr_len);

include/net/sctp/structs.h

+0 −10
Original line number Diff line number Diff line
@@ -438,16 +438,6 @@ struct sctp_af { 
					 int optname,

					 char __user *optval,

					 int __user *optlen);

	int		(*compat_setsockopt)	(struct sock *sk,

					 int level,

					 int optname,

					 char __user *optval,

					 unsigned int optlen);

	int		(*compat_getsockopt)	(struct sock *sk,

					 int level,

					 int optname,

					 char __user *optval,

					 int __user *optlen);

	void		(*get_dst)	(struct sctp_transport *t,

					 union sctp_addr *saddr,

					 struct flowi *fl,

include/net/sock.h

+0 −8
Original line number Diff line number Diff line
@@ -1147,14 +1147,6 @@ struct proto { 
					int __user *option);

	void			(*keepalive)(struct sock *sk, int valbool);

#ifdef CONFIG_COMPAT

	int			(*compat_setsockopt)(struct sock *sk,

					int level,

					int optname, char __user *optval,

					unsigned int optlen);

	int			(*compat_getsockopt)(struct sock *sk,

					int level,

					int optname, char __user *optval,

					int __user *option);

	int			(*compat_ioctl)(struct sock *sk,

					unsigned int cmd, unsigned long arg);

#endif

include/net/tcp.h

+0 −4
Original line number Diff line number Diff line
@@ -401,10 +401,6 @@ int tcp_getsockopt(struct sock *sk, int level, int optname, 
		   char __user *optval, int __user *optlen);

int tcp_setsockopt(struct sock *sk, int level, int optname,

		   char __user *optval, unsigned int optlen);

int compat_tcp_getsockopt(struct sock *sk, int level, int optname,

			  char __user *optval, int __user *optlen);

int compat_tcp_setsockopt(struct sock *sk, int level, int optname,

			  char __user *optval, unsigned int optlen);

void tcp_set_keepalive(struct sock *sk, int val);

void tcp_syn_ack_timeout(const struct request_sock *req);

int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,