1 files changed, 1 insertions, 69 deletions
diff --git a/arch/microblaze/include/asm/socket.h b/arch/microblaze/include/asm/socket.h
index 825936860314..6b71384b9d8b 100644
--- a/arch/microblaze/include/asm/socket.h
+++ b/arch/microblaze/include/asm/socket.h
@@ -1,69 +1 @@
-/*
+#include <asm-generic/socket.h>
- * Copyright (C) 2006 Atmark Techno, Inc.
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#ifndef _ASM_MICROBLAZE_SOCKET_H
-#define _ASM_MICROBLAZE_SOCKET_H
-#include <asm/sockios.h>
-/* For setsockoptions(2) */
-#define SOL_SOCKET      1
-#define SO_DEBUG        1
-#define SO_REUSEADDR    2
-#define SO_TYPE         3
-#define SO_ERROR        4
-#define SO_DONTROUTE    5
-#define SO_BROADCAST    6
-#define SO_SNDBUF       7
-#define SO_RCVBUF       8
-#define SO_SNDBUFFORCE  32
-#define SO_RCVBUFFORCE  33
-#define SO_KEEPALIVE    9
-#define SO_OOBINLINE    10
-#define SO_NO_CHECK     11
-#define SO_PRIORITY     12
-#define SO_LINGER       13
-#define SO_BSDCOMPAT    14
-/* To add :#define SO_REUSEPORT 15 */
-#define SO_PASSCRED     16
-#define SO_PEERCRED     17
-#define SO_RCVLOWAT     18
-#define SO_SNDLOWAT     19
-#define SO_RCVTIMEO     20
-#define SO_SNDTIMEO     21
-/* 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_ACCEPTCONN           30
-#define SO_PEERSEC              31
-#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
-#endif /* _ASM_MICROBLAZE_SOCKET_H */

diff --git a/arch/microblaze/include/asm/socket.h b/arch/microblaze/include/asm/socket.h index 825936860314..6b71384b9d8b 100644 --- a/arch/microblaze/include/asm/socket.h +++ b/arch/microblaze/include/asm/socket.h
@@ -1,69 +1 @@
1	/*	#include <asm-generic/socket.h>
2	* Copyright (C) 2006 Atmark Techno, Inc.
3	*
4	* This file is subject to the terms and conditions of the GNU General Public
5	* License. See the file "COPYING" in the main directory of this archive
6	* for more details.
7	*/
8
9	#ifndef _ASM_MICROBLAZE_SOCKET_H
10	#define _ASM_MICROBLAZE_SOCKET_H
11
12	#include <asm/sockios.h>
13
14	/* For setsockoptions(2) */
15	#define SOL_SOCKET 1
16
17	#define SO_DEBUG 1
18	#define SO_REUSEADDR 2
19	#define SO_TYPE 3
20	#define SO_ERROR 4
21	#define SO_DONTROUTE 5
22	#define SO_BROADCAST 6
23	#define SO_SNDBUF 7
24	#define SO_RCVBUF 8
25	#define SO_SNDBUFFORCE 32
26	#define SO_RCVBUFFORCE 33
27	#define SO_KEEPALIVE 9
28	#define SO_OOBINLINE 10
29	#define SO_NO_CHECK 11
30	#define SO_PRIORITY 12
31	#define SO_LINGER 13
32	#define SO_BSDCOMPAT 14
33	/* To add :#define SO_REUSEPORT 15 */
34	#define SO_PASSCRED 16
35	#define SO_PEERCRED 17
36	#define SO_RCVLOWAT 18
37	#define SO_SNDLOWAT 19
38	#define SO_RCVTIMEO 20
39	#define SO_SNDTIMEO 21
40
41	/* Security levels - as per NRL IPv6 - don't actually do anything */
42	#define SO_SECURITY_AUTHENTICATION 22
43	#define SO_SECURITY_ENCRYPTION_TRANSPORT 23
44	#define SO_SECURITY_ENCRYPTION_NETWORK 24
45
46	#define SO_BINDTODEVICE 25
47
48	/* Socket filtering */
49	#define SO_ATTACH_FILTER 26
50	#define SO_DETACH_FILTER 27
51
52	#define SO_PEERNAME 28
53	#define SO_TIMESTAMP 29
54	#define SCM_TIMESTAMP SO_TIMESTAMP
55
56	#define SO_ACCEPTCONN 30
57
58	#define SO_PEERSEC 31
59	#define SO_PASSSEC 34
60
61	#define SO_TIMESTAMPNS 35
62	#define SCM_TIMESTAMPNS SO_TIMESTAMPNS
63
64	#define SO_MARK 36
65
66	#define SO_TIMESTAMPING 37
67	#define SCM_TIMESTAMPING SO_TIMESTAMPING
68
69	#endif /* _ASM_MICROBLAZE_SOCKET_H */