From 52eff7ecddf7fcb622eeae2605d8531b2d54cb22 Mon Sep 17 00:00:00 2001
From: Andy Grover <andy.grover@oracle.com>
Date: Tue, 24 Feb 2009 15:30:39 +0000
Subject: [PATCH] --- yaml --- r: 134819 b: refs/heads/master c:
 fe17f84f5f2a7d6c1a31c04c06a016d4ad5f7dec h: refs/heads/master i:   134817:
 d83b244e7dbe45a167d5c545a5c9d09c9c8a92ed   134815:
 e856dedeb12a32b8d83becc65e5a51a8027ae5ce v: v3

---
 [refs]                 |  2 +-
 trunk/net/Kconfig      |  1 +
 trunk/net/Makefile     |  1 +
 trunk/net/rds/Kconfig  | 13 +++++++++++++
 trunk/net/rds/Makefile | 14 ++++++++++++++
 5 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 trunk/net/rds/Kconfig
 create mode 100644 trunk/net/rds/Makefile

diff --git a/[refs] b/[refs]
index 9f5eb50eac48..4867e8f9708c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a09ed661f756d3209a19271192abe9b892b59c7d
+refs/heads/master: fe17f84f5f2a7d6c1a31c04c06a016d4ad5f7dec
diff --git a/trunk/net/Kconfig b/trunk/net/Kconfig
index a12bae0e3fe9..6b39ede3b1b1 100644
--- a/trunk/net/Kconfig
+++ b/trunk/net/Kconfig
@@ -171,6 +171,7 @@ endif
 
 source "net/dccp/Kconfig"
 source "net/sctp/Kconfig"
+source "net/rds/Kconfig"
 source "net/tipc/Kconfig"
 source "net/atm/Kconfig"
 source "net/802/Kconfig"
diff --git a/trunk/net/Makefile b/trunk/net/Makefile
index 0fcce89d7169..9e00a55a901b 100644
--- a/trunk/net/Makefile
+++ b/trunk/net/Makefile
@@ -49,6 +49,7 @@ obj-y				+= 8021q/
 endif
 obj-$(CONFIG_IP_DCCP)		+= dccp/
 obj-$(CONFIG_IP_SCTP)		+= sctp/
+obj-$(CONFIG_RDS)		+= rds/
 obj-y				+= wireless/
 obj-$(CONFIG_MAC80211)		+= mac80211/
 obj-$(CONFIG_TIPC)		+= tipc/
diff --git a/trunk/net/rds/Kconfig b/trunk/net/rds/Kconfig
new file mode 100644
index 000000000000..63bd370ab6ee
--- /dev/null
+++ b/trunk/net/rds/Kconfig
@@ -0,0 +1,13 @@
+
+config RDS
+	tristate "Reliable Datagram Sockets (RDS) (EXPERIMENTAL)"
+	depends on INET && INFINIBAND_IPOIB && EXPERIMENTAL
+	---help---
+	  RDS provides reliable, sequenced delivery of datagrams
+	  over Infiniband.
+
+config RDS_DEBUG
+        bool "Debugging messages"
+	depends on RDS
+        default n
+
diff --git a/trunk/net/rds/Makefile b/trunk/net/rds/Makefile
new file mode 100644
index 000000000000..51f27585fa08
--- /dev/null
+++ b/trunk/net/rds/Makefile
@@ -0,0 +1,14 @@
+obj-$(CONFIG_RDS) += rds.o
+rds-y :=	af_rds.o bind.o cong.o connection.o info.o message.o   \
+			recv.o send.o stats.o sysctl.o threads.o transport.o \
+			loop.o page.o rdma.o \
+			rdma_transport.o \
+			ib.o ib_cm.o ib_recv.o ib_ring.o ib_send.o ib_stats.o \
+			ib_sysctl.o ib_rdma.o \
+			iw.o iw_cm.o iw_recv.o iw_ring.o iw_send.o iw_stats.o \
+			iw_sysctl.o iw_rdma.o
+
+ifeq ($(CONFIG_RDS_DEBUG), y)
+EXTRA_CFLAGS += -DDEBUG
+endif
+