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 f6c4e5baf3f7bd4ea9c065b25c9d49d723de1ace..2e2bd0b7c8e3e34616c6621b8e7dbd2cc7683567 100644 (file)
--- a/include/asm-sparc/socket.h
+++ b/include/asm-sparc/socket.h
@@ -49,6 +49,10 @@
 
 #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