diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2008-06-05 23:49:02 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-17 21:41:27 -0700 |
| commit | c8b8be5427a48c1a96dc0cf98ba772aedcda7e77 (patch) | |
| tree | 18f079e826e051e52beaa27bf4423b1042ec2a77 /include/asm-sparc64 | |
| parent | 62e612f0abb33c99c55ea3d04626f6799a1cdca9 (diff) | |
| download | linux-3.10-c8b8be5427a48c1a96dc0cf98ba772aedcda7e77.tar.gz linux-3.10-c8b8be5427a48c1a96dc0cf98ba772aedcda7e77.tar.bz2 linux-3.10-c8b8be5427a48c1a96dc0cf98ba772aedcda7e77.zip | |
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>
Diffstat (limited to 'include/asm-sparc64')
| -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 5af688f5671..13e0d5d94bb 100644 --- a/include/asm-sparc64/socket.h +++ b/include/asm-sparc64/socket.h @@ -1,57 +1 @@ -#ifndef _ASM_SOCKET_H -#define _ASM_SOCKET_H - -#include <asm/sockios.h> - -/* For setsockopt(2) */ -#define SOL_SOCKET 0xffff - -#define SO_DEBUG 0x0001 -#define SO_PASSCRED 0x0002 -#define SO_REUSEADDR 0x0004 -#define SO_KEEPALIVE 0x0008 -#define SO_DONTROUTE 0x0010 -#define SO_BROADCAST 0x0020 -#define SO_PEERCRED 0x0040 -#define SO_LINGER 0x0080 -#define SO_OOBINLINE 0x0100 -/* To add :#define SO_REUSEPORT 0x0200 */ -#define SO_BSDCOMPAT 0x0400 -#define SO_RCVLOWAT 0x0800 -#define SO_SNDLOWAT 0x1000 -#define SO_RCVTIMEO 0x2000 -#define SO_SNDTIMEO 0x4000 -#define SO_ACCEPTCONN 0x8000 - -#define SO_SNDBUF 0x1001 -#define SO_RCVBUF 0x1002 -#define SO_SNDBUFFORCE 0x100a -#define SO_RCVBUFFORCE 0x100b -#define SO_ERROR 0x1007 -#define SO_TYPE 0x1008 - -/* Linux specific, keep the same. */ -#define SO_NO_CHECK 0x000b -#define SO_PRIORITY 0x000c - -#define SO_BINDTODEVICE 0x000d - -#define SO_ATTACH_FILTER 0x001a -#define SO_DETACH_FILTER 0x001b - -#define SO_PEERNAME 0x001c -#define SO_TIMESTAMP 0x001d -#define SCM_TIMESTAMP SO_TIMESTAMP - -#define SO_PEERSEC 0x001e -#define SO_PASSSEC 0x001f -#define SO_TIMESTAMPNS 0x0021 -#define SCM_TIMESTAMPNS SO_TIMESTAMPNS - -/* 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 */ +#include <asm-sparc/socket.h> |