3 files changed, 20 insertions, 10 deletions

diff --git a/net/Makefile b/net/Makefile
index e5af3dc3a037..ba4460432b7c 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -56,8 +56,8 @@ obj-$(CONFIG_NETLABEL)		+= netlabel/
 obj-$(CONFIG_IUCV)              += iucv/
 obj-$(CONFIG_RFKILL)            += rfkill/
 obj-$(CONFIG_NET_9P)            += 9p/
-ifeq ($(CONFIG_DCBNL),y)
-obj-$(CONFIG_DCB)               += dcb/
+ifneq ($(CONFIG_DCB),)
+obj-y                           += dcb/
 endif
 
 ifeq ($(CONFIG_NET),y)
diff --git a/net/dcb/Kconfig b/net/dcb/Kconfig
index bdf38802d339..4066d59c8de5 100644
--- a/net/dcb/Kconfig
+++ b/net/dcb/Kconfig
@@ -1,12 +1,22 @@
 config DCB
-        tristate "Data Center Bridging support"
-
-config DCBNL
-        bool "Data Center Bridging netlink interface support"
-        depends on DCB
+        bool "Data Center Bridging support"
         default n
         ---help---
-          This option turns on the netlink interface
-          (dcbnl) for Data Center Bridging capable devices.
+          This enables support for configuring Data Center Bridging (DCB)
+          features on DCB capable Ethernet adapters via rtnetlink.  Say 'Y'
+          if you have a DCB capable Ethernet adapter which supports this
+          interface and you are connected to a DCB capable switch.
+
+          DCB is a collection of Ethernet enhancements which allow DCB capable
+          NICs and switches to support network traffic with differing
+          requirements (highly reliable, no drops vs. best effort vs. low
+          latency) to co-exist on Ethernet.
+
+          DCB features include:
+            Enhanced Transmission Selection (aka Priority Grouping) - provides a
+              framework for assigning bandwidth guarantees to traffic classes.
+            Priority-based Flow Control (PFC) - a MAC control pause frame which
+              works at the granularity of the 802.1p priority instead of the
+              link (802.3x).
 
           If unsure, say N.
diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c
index b2bda3f610df..79a351d323af 100644
--- a/net/dcb/dcbnl.c
+++ b/net/dcb/dcbnl.c
@@ -48,7 +48,7 @@
  */
 
 MODULE_AUTHOR("Lucy Liu, <lucy.liu@intel.com>");
-MODULE_DESCRIPTION("Data Center Bridging generic netlink interface");
+MODULE_DESCRIPTION("Data Center Bridging netlink interface");
 MODULE_LICENSE("GPL");
 
 /**************** DCB attribute policies *************************************/