1 files changed, 1 insertions, 82 deletions
diff --git a/arch/mips/include/asm/socket.h b/arch/mips/include/asm/socket.h
index a2ed6fdad4e0..4724a563c5bf 100644
--- a/arch/mips/include/asm/socket.h
+++ b/arch/mips/include/asm/socket.h
@@ -9,87 +9,8 @@
 #ifndef _ASM_SOCKET_H
 #define _ASM_SOCKET_H
-#include <asm/sockios.h>
+#include <uapi/asm/socket.h>
-/*
- * For setsockopt(2)
- *
- * This defines are ABI conformant as far as Linux supports these ...
- */
-#define SOL_SOCKET      0xffff
-#define SO_DEBUG        0x0001  /* Record debugging information.  */
-#define SO_REUSEADDR    0x0004  /* Allow reuse of local addresses.  */
-#define SO_KEEPALIVE    0x0008  /* Keep connections alive and send
-                                   SIGPIPE when they die.  */
-#define SO_DONTROUTE    0x0010  /* Don't do local routing.  */
-#define SO_BROADCAST    0x0020  /* Allow transmission of
-                                   broadcast messages.  */
-#define SO_LINGER       0x0080  /* Block on close of a reliable
-                                   socket to transmit pending data.  */
-#define SO_OOBINLINE 0x0100     /* Receive out-of-band data in-band.  */
-#if 0
-To add: #define SO_REUSEPORT 0x0200     /* Allow local address and port reuse.  */
-#endif
-#define SO_TYPE         0x1008  /* Compatible name for SO_STYLE.  */
-#define SO_STYLE        SO_TYPE /* Synonym */
-#define SO_ERROR        0x1007  /* get error status and clear */
-#define SO_SNDBUF       0x1001  /* Send buffer size. */
-#define SO_RCVBUF       0x1002  /* Receive buffer. */
-#define SO_SNDLOWAT     0x1003  /* send low-water mark */
-#define SO_RCVLOWAT     0x1004  /* receive low-water mark */
-#define SO_SNDTIMEO     0x1005  /* send timeout */
-#define SO_RCVTIMEO     0x1006  /* receive timeout */
-#define SO_ACCEPTCONN   0x1009
-#define SO_PROTOCOL     0x1028  /* protocol type */
-#define SO_DOMAIN       0x1029  /* domain/socket family */
-/* linux-specific, might as well be the same as on i386 */
-#define SO_NO_CHECK     11
-#define SO_PRIORITY     12
-#define SO_BSDCOMPAT    14
-#define SO_PASSCRED     17
-#define SO_PEERCRED     18
-/* Security levels - as per NRL IPv6 - don't actually do anything */
-#define SO_SECURITY_AUTHENTICATION              22
-#define SO_SECURITY_ENCRYPTION_TRANSPORT        23
-#define SO_SECURITY_ENCRYPTION_NETWORK          24
-#define SO_BINDTODEVICE         25
-/* Socket filtering */
-#define SO_ATTACH_FILTER        26
-#define SO_DETACH_FILTER        27
-#define SO_PEERNAME             28
-#define SO_TIMESTAMP            29
-#define SCM_TIMESTAMP           SO_TIMESTAMP
-#define SO_PEERSEC              30
-#define SO_SNDBUFFORCE          31
-#define SO_RCVBUFFORCE          33
-#define SO_PASSSEC              34
-#define SO_TIMESTAMPNS          35
-#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS
-#define SO_MARK                 36
-#define SO_TIMESTAMPING         37
-#define SCM_TIMESTAMPING        SO_TIMESTAMPING
-#define SO_RXQ_OVFL             40
-#define SO_WIFI_STATUS          41
-#define SCM_WIFI_STATUS         SO_WIFI_STATUS
-#define SO_PEEK_OFF             42
-/* Instruct lower device to use last 4-bytes of skb data as FCS */
-#define SO_NOFCS                43
-#ifdef __KERNEL__
 /** sock_type - Socket types
 *
@@ -126,6 +47,4 @@ enum sock_type {
 #define ARCH_HAS_SOCKET_TYPES 1
-#endif /* __KERNEL__ */
 #endif /* _ASM_SOCKET_H */

diff --git a/arch/mips/include/asm/socket.h b/arch/mips/include/asm/socket.h index a2ed6fdad4e0..4724a563c5bf 100644 --- a/arch/mips/include/asm/socket.h +++ b/arch/mips/include/asm/socket.h
@@ -9,87 +9,8 @@
9	#ifndef _ASM_SOCKET_H	9	#ifndef _ASM_SOCKET_H
10	#define _ASM_SOCKET_H	10	#define _ASM_SOCKET_H
11		11
12	#include <asm/sockios.h>	12	#include <uapi/asm/socket.h>
13		13
14	/*
15	* For setsockopt(2)
16	*
17	* This defines are ABI conformant as far as Linux supports these ...
18	*/
19	#define SOL_SOCKET 0xffff
20
21	#define SO_DEBUG 0x0001 /* Record debugging information. */
22	#define SO_REUSEADDR 0x0004 /* Allow reuse of local addresses. */
23	#define SO_KEEPALIVE 0x0008 /* Keep connections alive and send
24	SIGPIPE when they die. */
25	#define SO_DONTROUTE 0x0010 /* Don't do local routing. */
26	#define SO_BROADCAST 0x0020 /* Allow transmission of
27	broadcast messages. */
28	#define SO_LINGER 0x0080 /* Block on close of a reliable
29	socket to transmit pending data. */
30	#define SO_OOBINLINE 0x0100 /* Receive out-of-band data in-band. */
31	#if 0
32	To add: #define SO_REUSEPORT 0x0200 /* Allow local address and port reuse. */
33	#endif
34
35	#define SO_TYPE 0x1008 /* Compatible name for SO_STYLE. */
36	#define SO_STYLE SO_TYPE /* Synonym */
37	#define SO_ERROR 0x1007 /* get error status and clear */
38	#define SO_SNDBUF 0x1001 /* Send buffer size. */
39	#define SO_RCVBUF 0x1002 /* Receive buffer. */
40	#define SO_SNDLOWAT 0x1003 /* send low-water mark */
41	#define SO_RCVLOWAT 0x1004 /* receive low-water mark */
42	#define SO_SNDTIMEO 0x1005 /* send timeout */
43	#define SO_RCVTIMEO 0x1006 /* receive timeout */
44	#define SO_ACCEPTCONN 0x1009
45	#define SO_PROTOCOL 0x1028 /* protocol type */
46	#define SO_DOMAIN 0x1029 /* domain/socket family */
47
48	/* linux-specific, might as well be the same as on i386 */
49	#define SO_NO_CHECK 11
50	#define SO_PRIORITY 12
51	#define SO_BSDCOMPAT 14
52
53	#define SO_PASSCRED 17
54	#define SO_PEERCRED 18
55
56	/* Security levels - as per NRL IPv6 - don't actually do anything */
57	#define SO_SECURITY_AUTHENTICATION 22
58	#define SO_SECURITY_ENCRYPTION_TRANSPORT 23
59	#define SO_SECURITY_ENCRYPTION_NETWORK 24
60
61	#define SO_BINDTODEVICE 25
62
63	/* Socket filtering */
64	#define SO_ATTACH_FILTER 26
65	#define SO_DETACH_FILTER 27
66
67	#define SO_PEERNAME 28
68	#define SO_TIMESTAMP 29
69	#define SCM_TIMESTAMP SO_TIMESTAMP
70
71	#define SO_PEERSEC 30
72	#define SO_SNDBUFFORCE 31
73	#define SO_RCVBUFFORCE 33
74	#define SO_PASSSEC 34
75	#define SO_TIMESTAMPNS 35
76	#define SCM_TIMESTAMPNS SO_TIMESTAMPNS
77
78	#define SO_MARK 36
79
80	#define SO_TIMESTAMPING 37
81	#define SCM_TIMESTAMPING SO_TIMESTAMPING
82
83	#define SO_RXQ_OVFL 40
84
85	#define SO_WIFI_STATUS 41
86	#define SCM_WIFI_STATUS SO_WIFI_STATUS
87	#define SO_PEEK_OFF 42
88
89	/* Instruct lower device to use last 4-bytes of skb data as FCS */
90	#define SO_NOFCS 43
91
92	#ifdef __KERNEL__
93		14
94	/** sock_type - Socket types	15	/** sock_type - Socket types
95	*	16	*
@@ -126,6 +47,4 @@ enum sock_type {
126		47
127	#define ARCH_HAS_SOCKET_TYPES 1	48	#define ARCH_HAS_SOCKET_TYPES 1
128		49
129	#endif /* __KERNEL__ */
130
131	#endif /* _ASM_SOCKET_H */	50	#endif /* _ASM_SOCKET_H */