RDS: Kconfig and Makefile changes

Signed-off-by: Ajaykumar Hotchandani <ajaykumar.hotchandani@oracle.com>

diff --git a/net/rds/Kconfig b/net/rds/Kconfig
index d6679c854a9cb76b92af2714f7d251bde96a0e8d..f2c670ba7b9b2b26592e1b07bbedf0c5b8b3b842 100644 (file)
--- a/net/rds/Kconfig
+++ b/net/rds/Kconfig
@@ -1,15 +1,15 @@
 
 config RDS
-       tristate "Reliable Datagram Sockets (RDS) (EXPERIMENTAL)"
-       depends on INET && INFINIBAND_IPOIB && EXPERIMENTAL
-       depends on INFINIBAND && INFINIBAND_ADDR_TRANS
+       tristate "The RDS Protocol"
+       depends on INET
        ---help---
-         RDS provides reliable, sequenced delivery of datagrams
-         over Infiniband.
+         The RDS (Reliable Datagram Sockets) protocol provides reliable,
+         sequenced delivery of datagrams over Infiniband, iWARP,
+         or TCP.
 
 config RDS_RDMA
        tristate "RDS over Infiniband and iWARP"
-       depends on RDS && INFINIBAND_ADDR_TRANS
+       depends on RDS && INFINIBAND && INFINIBAND_ADDR_TRANS
        ---help---
          Allow RDS to use Infiniband and iWARP as a transport.
          This transport supports RDMA operations.
@@ -22,7 +22,7 @@ config RDS_TCP
          This transport does not support RDMA operations.
 
 config RDS_DEBUG
-        bool "Debugging messages"
+        bool "RDS debugging messages"
        depends on RDS
         default n
 

diff --git a/net/rds/Makefile b/net/rds/Makefile
index b46eca109688b703e443ac2d63e09da9afcbec18..56d3f6023ced41adb81510ec0dc8525c9230dea9 100644 (file)
--- a/net/rds/Makefile
+++ b/net/rds/Makefile
@@ -4,7 +4,7 @@ rds-y :=        af_rds.o bind.o cong.o connection.o info.o message.o   \
                        loop.o page.o rdma.o
 
 obj-$(CONFIG_RDS_RDMA) += rds_rdma.o
-rds_rdma-objs :=       rdma_transport.o \
+rds_rdma-y :=  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 \
@@ -12,10 +12,8 @@ rds_rdma-objs :=     rdma_transport.o \
 
 
 obj-$(CONFIG_RDS_TCP) += rds_tcp.o
-rds_tcp-objs :=                tcp.o tcp_connect.o tcp_listen.o tcp_recv.o \
+rds_tcp-y :=           tcp.o tcp_connect.o tcp_listen.o tcp_recv.o \
                        tcp_send.o tcp_stats.o
 
-ifeq ($(CONFIG_RDS_DEBUG), y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_RDS_DEBUG)    :=      -DDEBUG