Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[powerpc.git] / include / linux / socket.h

diff --git a/include/linux/socket.h b/include/linux/socket.h
index 92cd38e..6e7c948 100644 (file)
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -187,7 +187,9 @@ struct ucred {
 #define AF_LLC         26      /* Linux LLC                    */
 #define AF_TIPC                30      /* TIPC sockets                 */
 #define AF_BLUETOOTH   31      /* Bluetooth sockets            */
-#define AF_MAX         32      /* For now.. */
+#define AF_IUCV                32      /* IUCV sockets                 */
+#define AF_RXRPC       33      /* RxRPC sockets                */
+#define AF_MAX         34      /* For now.. */
 
 /* Protocol families, same as address families. */
 #define PF_UNSPEC      AF_UNSPEC
@@ -220,6 +222,8 @@ struct ucred {
 #define PF_LLC         AF_LLC
 #define PF_TIPC                AF_TIPC
 #define PF_BLUETOOTH   AF_BLUETOOTH
+#define PF_IUCV                AF_IUCV
+#define PF_RXRPC       AF_RXRPC
 #define PF_MAX         AF_MAX
 
 /* Maximum queue length specifiable by listen.  */
@@ -282,6 +286,7 @@ struct ucred {
 #define SOL_DCCP       269
 #define SOL_NETLINK    270
 #define SOL_TIPC       271
+#define SOL_RXRPC      272
 
 /* IPX options */
 #define IPX_TYPE       1