diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:29:41 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:30:32 -0500 |
| commit | c1f3ee120bb61045b1c0a3ead620d1d65af47130 (patch) | |
| tree | 908430bf2b47fe8e96ac623ae7ab6dd5698d0938 /include/asm-sparc/socket.h | |
| parent | e619a75ff6201b567a539e787aa9af9bc63a3187 (diff) | |
| parent | 9135f1901ee6449dfe338adf6e40e9c2025b8150 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-sparc/socket.h')
| -rw-r--r-- | include/asm-sparc/socket.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-sparc/socket.h b/include/asm-sparc/socket.h index 7c1423997cf0..2e2bd0b7c8e3 100644 --- a/include/asm-sparc/socket.h +++ b/include/asm-sparc/socket.h | |||
| @@ -52,6 +52,8 @@ | |||
| 52 | #define SO_TIMESTAMPNS 0x0021 | 52 | #define SO_TIMESTAMPNS 0x0021 |
| 53 | #define SCM_TIMESTAMPNS SO_TIMESTAMPNS | 53 | #define SCM_TIMESTAMPNS SO_TIMESTAMPNS |
| 54 | 54 | ||
| 55 | #define SO_MARK 0x0022 | ||
| 56 | |||
| 55 | /* Security levels - as per NRL IPv6 - don't actually do anything */ | 57 | /* Security levels - as per NRL IPv6 - don't actually do anything */ |
| 56 | #define SO_SECURITY_AUTHENTICATION 0x5001 | 58 | #define SO_SECURITY_AUTHENTICATION 0x5001 |
| 57 | #define SO_SECURITY_ENCRYPTION_TRANSPORT 0x5002 | 59 | #define SO_SECURITY_ENCRYPTION_TRANSPORT 0x5002 |