diff options
Diffstat (limited to 'include/linux/socket.h')
| -rw-r--r-- | include/linux/socket.h | 20 | 
1 files changed, 1 insertions, 19 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index ba7b2e817cf..9a546ff853d 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -1,30 +1,13 @@  #ifndef _LINUX_SOCKET_H  #define _LINUX_SOCKET_H -/* - * Desired design of maximum size and alignment (see RFC2553) - */ -#define _K_SS_MAXSIZE	128	/* Implementation specific max size */ -#define _K_SS_ALIGNSIZE	(__alignof__ (struct sockaddr *)) -				/* Implementation specific desired alignment */ - -typedef unsigned short __kernel_sa_family_t; - -struct __kernel_sockaddr_storage { -	__kernel_sa_family_t	ss_family;		/* address family */ -	/* Following field(s) are implementation specific */ -	char		__data[_K_SS_MAXSIZE - sizeof(unsigned short)]; -				/* space to achieve desired size, */ -				/* _SS_MAXSIZE value minus size of ss_family */ -} __attribute__ ((aligned(_K_SS_ALIGNSIZE)));	/* force desired alignment */ - -#ifdef __KERNEL__  #include <asm/socket.h>			/* arch-dependent defines	*/  #include <linux/sockios.h>		/* the SIOCxxx I/O controls	*/  #include <linux/uio.h>			/* iovec support		*/  #include <linux/types.h>		/* pid_t			*/  #include <linux/compiler.h>		/* __user			*/ +#include <uapi/linux/socket.h>  struct pid;  struct cred; @@ -340,5 +323,4 @@ extern int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen  			  unsigned int flags, struct timespec *timeout);  extern int __sys_sendmmsg(int fd, struct mmsghdr __user *mmsg,  			  unsigned int vlen, unsigned int flags); -#endif /* not kernel and not glibc */  #endif /* _LINUX_SOCKET_H */  |