Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux...

[safe/jmp/linux-2.6] / include / linux / socket.h

diff --git a/include/linux/socket.h b/include/linux/socket.h
index 6e7c948..f852e1a 100644 (file)
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -253,6 +253,9 @@ struct ucred {
 
 #define MSG_EOF         MSG_FIN
 
+#define MSG_CMSG_CLOEXEC 0x40000000    /* Set close_on_exit for file
+                                          descriptor received through
+                                          SCM_RIGHTS */
 #if defined(CONFIG_COMPAT)
 #define MSG_CMSG_COMPAT        0x80000000      /* This message needs 32 bit fixups */
 #else
@@ -287,6 +290,7 @@ struct ucred {
 #define SOL_NETLINK    270
 #define SOL_TIPC       271
 #define SOL_RXRPC      272
+#define SOL_PPPOL2TP   273
 
 /* IPX options */
 #define IPX_TYPE       1