[PATCH] IB: clean up user access config options

Add a new config option INFINIBAND_USER_MAD to control whether we
build ib_umad.  Change INFINIBAND_USER_VERBS to INFINIBAND_USER_ACCESS,
and have it control ib_ucm and ib_uat as well as ib_uverbs.

Signed-off-by: James Lentini <jlentini@netapp.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

2 files changed, 21 insertions, 9 deletions

diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index 32cdfb30e9b4..325d502e25cd 100644
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -8,15 +8,26 @@ config INFINIBAND
           any protocols you wish to use as well as drivers for your
           InfiniBand hardware.
 
-config INFINIBAND_USER_VERBS
-        tristate "InfiniBand userspace verbs support"
+config INFINIBAND_USER_MAD
+        tristate "InfiniBand userspace MAD support"
         depends on INFINIBAND
         ---help---
-          Userspace InfiniBand verbs support.  This is the kernel side
-          of userspace verbs, which allows userspace processes to
-          directly access InfiniBand hardware for fast-path
-          operations.  You will also need libibverbs and a hardware
-          driver library from <http://www.openib.org>.
+          Userspace InfiniBand Management Datagram (MAD) support.  This
+          is the kernel side of the userspace MAD support, which allows
+          userspace processes to send and receive MADs. You will also 
+          need libibumad from <http://www.openib.org>.
+
+config INFINIBAND_USER_ACCESS
+        tristate "InfiniBand userspace access (verbs and CM)"
+        depends on INFINIBAND
+        ---help---
+          Userspace InfiniBand access support.  This enables the
+          kernel side of userspace verbs and the userspace
+          communication manager (CM).  This allows userspace processes
+          to set up connections and directly access InfiniBand
+          hardware for fast-path operations.  You will also need
+          libibverbs, libibcm and a hardware driver library from
+          <http://www.openib.org>.
 
 source "drivers/infiniband/hw/mthca/Kconfig"
 
diff --git a/drivers/infiniband/core/Makefile b/drivers/infiniband/core/Makefile
index 678a7e097f32..ec3353f24b27 100644
--- a/drivers/infiniband/core/Makefile
+++ b/drivers/infiniband/core/Makefile
@@ -1,6 +1,7 @@
 obj-$(CONFIG_INFINIBAND) +=             ib_core.o ib_mad.o ib_sa.o \
-                                        ib_cm.o ib_umad.o ib_ucm.o
-obj-$(CONFIG_INFINIBAND_USER_VERBS) +=  ib_uverbs.o
+                                        ib_cm.o
+obj-$(CONFIG_INFINIBAND_USER_MAD) +=    ib_umad.o
+obj-$(CONFIG_INFINIBAND_USER_ACCESS) += ib_uverbs.o ib_ucm.o
 
 ib_core-y :=                    packer.o ud_header.o verbs.o sysfs.o \
                                 device.o fmr_pool.o cache.o