Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

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

diff --git a/include/linux/socket.h b/include/linux/socket.h
index 1739c2d5b95b449669b887aa86aeb324d836c1f2..9ab2ddd802212667c06c48b317f757ae2677225d 100644 (file)
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -27,7 +27,6 @@ struct __kernel_sockaddr_storage {
 #include <linux/compiler.h>            /* __user                       */
 
 extern int sysctl_somaxconn;
-extern void sock_init(void);
 #ifdef CONFIG_PROC_FS
 struct seq_file;
 extern void socket_seq_show(struct seq_file *seq);
@@ -151,6 +150,7 @@ __KINLINE struct cmsghdr * cmsg_nxthdr (struct msghdr *__msg, struct cmsghdr *__
 
 #define        SCM_RIGHTS      0x01            /* rw: access rights (array of int) */
 #define SCM_CREDENTIALS 0x02           /* rw: struct ucred             */
+#define SCM_SECURITY   0x03            /* rw: security label           */
 
 struct ucred {
        __u32   pid;
@@ -187,6 +187,7 @@ struct ucred {
 #define AF_PPPOX       24      /* PPPoX sockets                */
 #define AF_WANPIPE     25      /* Wanpipe API Sockets */
 #define AF_LLC         26      /* Linux LLC                    */
+#define AF_TIPC                30      /* TIPC sockets                 */
 #define AF_BLUETOOTH   31      /* Bluetooth sockets            */
 #define AF_MAX         32      /* For now.. */
 
@@ -219,6 +220,7 @@ struct ucred {
 #define PF_PPPOX       AF_PPPOX
 #define PF_WANPIPE     AF_WANPIPE
 #define PF_LLC         AF_LLC
+#define PF_TIPC                AF_TIPC
 #define PF_BLUETOOTH   AF_BLUETOOTH
 #define PF_MAX         AF_MAX
 
@@ -280,6 +282,7 @@ struct ucred {
 #define SOL_LLC                268
 #define SOL_DCCP       269
 #define SOL_NETLINK    270
+#define SOL_TIPC       271
 
 /* IPX options */
 #define IPX_TYPE       1