From e856dedeb12a32b8d83becc65e5a51a8027ae5ce Mon Sep 17 00:00:00 2001
From: Andy Grover <andy.grover@oracle.com>
Date: Thu, 26 Feb 2009 23:41:38 -0800
Subject: [PATCH] --- yaml --- r: 134815 b: refs/heads/master c:
 8a7c4c77267b1c77296cd03e6704813cb70706d1 h: refs/heads/master i:   134813:
 5385371969cac96223727fc17f2d053b60198c81   134811:
 21d682bb9a538f6a0c1f3c5d1c495ad6f0f0c5eb   134807:
 fb6f4467e124b0b8e8e86fdbc5d52ed2cfe5f7e5   134799:
 1640050f12e809f665c9baa4dd7153c6dc1498b4   134783:
 a3274fc529f412c7a82db8e84904e319e969cbd8 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/socket.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c76417077ac7..3e5286618939 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c5f9b8830aa0ff8f97e4efdfe1e1c4fe08ec71c
+refs/heads/master: 8a7c4c77267b1c77296cd03e6704813cb70706d1
diff --git a/trunk/include/linux/socket.h b/trunk/include/linux/socket.h
index 20fc4bbfca42..9c90dc403efc 100644
--- a/trunk/include/linux/socket.h
+++ b/trunk/include/linux/socket.h
@@ -179,6 +179,7 @@ struct ucred {
 #define AF_ASH		18	/* Ash				*/
 #define AF_ECONET	19	/* Acorn Econet			*/
 #define AF_ATMSVC	20	/* ATM SVCs			*/
+#define AF_RDS		21	/* RDS sockets 			*/
 #define AF_SNA		22	/* Linux SNA Project (nutters!) */
 #define AF_IRDA		23	/* IRDA sockets			*/
 #define AF_PPPOX	24	/* PPPoX sockets		*/
@@ -217,6 +218,7 @@ struct ucred {
 #define PF_ASH		AF_ASH
 #define PF_ECONET	AF_ECONET
 #define PF_ATMSVC	AF_ATMSVC
+#define PF_RDS		AF_RDS
 #define PF_SNA		AF_SNA
 #define PF_IRDA		AF_IRDA
 #define PF_PPPOX	AF_PPPOX
@@ -298,6 +300,7 @@ struct ucred {
 #define SOL_PPPOL2TP	273
 #define SOL_BLUETOOTH	274
 #define SOL_PNPIPE	275
+#define SOL_RDS		276
 
 /* IPX options */
 #define IPX_TYPE	1