Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[karo-tx-linux.git] / net / batman-adv / Kconfig

diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig
index 833bb145ba3ce445d585dd86b7e925d4350476c8..b73b96a2854b152eebf8e9a5c68caa892318c6e6 100644 (file)
--- a/net/batman-adv/Kconfig
+++ b/net/batman-adv/Kconfig
@@ -17,7 +17,7 @@ config BATMAN_ADV
 
 config BATMAN_ADV_BATMAN_V
        bool "B.A.T.M.A.N. V protocol (experimental)"
-       depends on BATMAN_ADV && CFG80211=y || (CFG80211=m && BATMAN_ADV=m)
+       depends on BATMAN_ADV && !(CFG80211=m && BATMAN_ADV=y)
        default n
        help
          This option enables the B.A.T.M.A.N. V protocol, the successor
@@ -73,10 +73,21 @@ config BATMAN_ADV_MCAST
          reduce the air overhead while improving the reliability of
          multicast messages.
 
-config BATMAN_ADV_DEBUG
-       bool "B.A.T.M.A.N. debugging"
+config BATMAN_ADV_DEBUGFS
+       bool "batman-adv debugfs entries"
        depends on BATMAN_ADV
        depends on DEBUG_FS
+       default y
+       help
+         Enable this to export routing related debug tables via debugfs.
+         The information for each soft-interface and used hard-interface can be
+         found under batman_adv/
+
+         If unsure, say Y.
+
+config BATMAN_ADV_DEBUG
+       bool "B.A.T.M.A.N. debugging"
+       depends on BATMAN_ADV_DEBUGFS
        help
          This is an option for use by developers; most people should
          say N here. This enables compilation of support for