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/linux/rslib.h | |
| 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>
Diffstat (limited to 'include/linux/rslib.h')
0 files changed, 0 insertions, 0 deletions