Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstrea...

[linux-2.6-omap-h63xx.git] / include / asm-sparc / socket.h

diff --git a/include/asm-sparc/socket.h b/include/asm-sparc/socket.h
index 09575b608adbb584b644adc3183eadacafe738bd..2e2bd0b7c8e3e34616c6621b8e7dbd2cc7683567 100644 (file)
--- a/include/asm-sparc/socket.h
+++ b/include/asm-sparc/socket.h
@@ -47,7 +47,12 @@
 #define SO_TIMESTAMP           0x001d
 #define SCM_TIMESTAMP          SO_TIMESTAMP
 
-#define SO_PEERSEC             0x100e
+#define SO_PEERSEC             0x001e
+#define SO_PASSSEC             0x001f
+#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