diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2008-06-05 17:49:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-18 00:41:27 -0400 |
| commit | c8b8be5427a48c1a96dc0cf98ba772aedcda7e77 (patch) | |
| tree | 18f079e826e051e52beaa27bf4423b1042ec2a77 | |
| parent | 62e612f0abb33c99c55ea3d04626f6799a1cdca9 (diff) | |
sparc: Merge asm-sparc{,64}/socket.h
:$ diff -u include/asm-sparc/socket.h include/asm-sparc64/socket.h
:-- include/asm-sparc/socket.h 2008-06-13 06:46:39.000000000 +0200
:++ include/asm-sparc64/socket.h 2008-06-13 06:46:39.000000000 +0200
:@@ -48,11 +48,10 @@
: #define SO_TIMESTAMPNS 0x0021
: #define SCM_TIMESTAMPNS SO_TIMESTAMPNS
:
:-#define SO_MARK 0x0022
:-
: /* Security levels - as per NRL IPv6 - don't actually do anything */
: #define SO_SECURITY_AUTHENTICATION 0x5001
: #define SO_SECURITY_ENCRYPTION_TRANSPORT 0x5002
: #define SO_SECURITY_ENCRYPTION_NETWORK 0x5004
:
:+#define SO_MARK 0x0022
: #endif /* _ASM_SOCKET_H */
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| -rw-r--r-- | include/asm-sparc64/socket.h | 58 |
1 files changed, 1 insertions, 57 deletions
diff --git a/include/asm-sparc64/socket.h b/include/asm-sparc64/socket.h index 5af688f56716..13e0d5d94bb3 100644 --- a/include/asm-sparc64/socket.h +++ b/include/asm-sparc64/socket.h | |||
| @@ -1,57 +1 @@ | |||
| 1 | #ifndef _ASM_SOCKET_H | #include <asm-sparc/socket.h> | |
| 2 | #define _ASM_SOCKET_H | ||
| 3 | |||
| 4 | #include <asm/sockios.h> | ||
| 5 | |||
| 6 | /* For setsockopt(2) */ | ||
| 7 | #define SOL_SOCKET 0xffff | ||
| 8 | |||
| 9 | #define SO_DEBUG 0x0001 | ||
| 10 | #define SO_PASSCRED 0x0002 | ||
| 11 | #define SO_REUSEADDR 0x0004 | ||
| 12 | #define SO_KEEPALIVE 0x0008 | ||
| 13 | #define SO_DONTROUTE 0x0010 | ||
| 14 | #define SO_BROADCAST 0x0020 | ||
| 15 | #define SO_PEERCRED 0x0040 | ||
| 16 | #define SO_LINGER 0x0080 | ||
| 17 | #define SO_OOBINLINE 0x0100 | ||
| 18 | /* To add :#define SO_REUSEPORT 0x0200 */ | ||
| 19 | #define SO_BSDCOMPAT 0x0400 | ||
| 20 | #define SO_RCVLOWAT 0x0800 | ||
| 21 | #define SO_SNDLOWAT 0x1000 | ||
| 22 | #define SO_RCVTIMEO 0x2000 | ||
| 23 | #define SO_SNDTIMEO 0x4000 | ||
| 24 | #define SO_ACCEPTCONN 0x8000 | ||
| 25 | |||
| 26 | #define SO_SNDBUF 0x1001 | ||
| 27 | #define SO_RCVBUF 0x1002 | ||
| 28 | #define SO_SNDBUFFORCE 0x100a | ||
| 29 | #define SO_RCVBUFFORCE 0x100b | ||
| 30 | #define SO_ERROR 0x1007 | ||
| 31 | #define SO_TYPE 0x1008 | ||
| 32 | |||
| 33 | /* Linux specific, keep the same. */ | ||
| 34 | #define SO_NO_CHECK 0x000b | ||
| 35 | #define SO_PRIORITY 0x000c | ||
| 36 | |||
| 37 | #define SO_BINDTODEVICE 0x000d | ||
| 38 | |||
| 39 | #define SO_ATTACH_FILTER 0x001a | ||
| 40 | #define SO_DETACH_FILTER 0x001b | ||
| 41 | |||
| 42 | #define SO_PEERNAME 0x001c | ||
| 43 | #define SO_TIMESTAMP 0x001d | ||
| 44 | #define SCM_TIMESTAMP SO_TIMESTAMP | ||
| 45 | |||
| 46 | #define SO_PEERSEC 0x001e | ||
| 47 | #define SO_PASSSEC 0x001f | ||
| 48 | #define SO_TIMESTAMPNS 0x0021 | ||
| 49 | #define SCM_TIMESTAMPNS SO_TIMESTAMPNS | ||
| 50 | |||
| 51 | /* Security levels - as per NRL IPv6 - don't actually do anything */ | ||
| 52 | #define SO_SECURITY_AUTHENTICATION 0x5001 | ||
| 53 | #define SO_SECURITY_ENCRYPTION_TRANSPORT 0x5002 | ||
| 54 | #define SO_SECURITY_ENCRYPTION_NETWORK 0x5004 | ||
| 55 | |||
| 56 | #define SO_MARK 0x0022 | ||
| 57 | #endif /* _ASM_SOCKET_H */ | ||