Merge tag 'for-v3.12' of git://git.infradead.org/battery-2.6

[firefly-linux-kernel-4.4.55.git] / net / dcb / Kconfig

diff --git a/net/dcb/Kconfig b/net/dcb/Kconfig
index bdf38802d339d437acec6c4e1120e3557b76a18c..4066d59c8de5e0c4a3308a9a0a00f30519b00be8 100644 (file)
--- 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.