Merge pull request #451 from ecsv/batadv-2019.0

[feed/routing.git] / batman-adv / Config.in

diff --git a/batman-adv/Config.in b/batman-adv/Config.in
index 687acf0c778557a591d9fa157b836b542efd2a29..127a020b4a34cd82045f9f71c1c9960ddc46a918 100644 (file)
--- a/batman-adv/Config.in
+++ b/batman-adv/Config.in
@@ -19,7 +19,7 @@
 # B.A.T.M.A.N meshing protocol
 #
 
-config KMOD_BATMAN_ADV_BATMAN_V
+config BATMAN_ADV_BATMAN_V
        bool "B.A.T.M.A.N. V protocol"
        depends on PACKAGE_kmod-batman-adv
        default y
@@ -33,7 +33,7 @@ config KMOD_BATMAN_ADV_BATMAN_V
          B.A.T.M.A.N. V is currently considered experimental and not
          compatible to B.A.T.M.A.N. IV networks.
 
-config KMOD_BATMAN_ADV_BLA
+config BATMAN_ADV_BLA
        bool "Bridge Loop Avoidance"
        depends on PACKAGE_kmod-batman-adv
        select PACKAGE_kmod-lib-crc16
@@ -45,7 +45,7 @@ config KMOD_BATMAN_ADV_BLA
          more than one mesh node in the same LAN, you can safely remove
          this feature and save some space.
 
-config KMOD_BATMAN_ADV_DAT
+config BATMAN_ADV_DAT
        bool "Distributed ARP Table"
        depends on PACKAGE_kmod-batman-adv
        default y
@@ -55,7 +55,7 @@ config KMOD_BATMAN_ADV_DAT
          mesh networks. If you think that your network does not need
          this option you can safely remove it and save some space.
 
-config KMOD_BATMAN_ADV_NC
+config BATMAN_ADV_NC
        bool "Network Coding"
        depends on PACKAGE_kmod-batman-adv
        help
@@ -68,15 +68,16 @@ config KMOD_BATMAN_ADV_NC
          If you think that your network does not need this feature you
          can safely disable it and save some space.
 
-config KMOD_BATMAN_ADV_MCAST
+config BATMAN_ADV_MCAST
        bool "Multicast optimisation"
        depends on PACKAGE_kmod-batman-adv
+       default y
        help
          This option enables the multicast optimisation which aims to
          reduce the air overhead while improving the reliability of
          multicast messages.
 
-config KMOD_BATMAN_ADV_DEBUGFS
+config BATMAN_ADV_DEBUGFS
        bool "batman-adv debugfs entries"
        depends on PACKAGE_kmod-batman-adv
        select KERNEL_DEBUG_FS
@@ -87,11 +88,23 @@ config KMOD_BATMAN_ADV_DEBUGFS
 
          If unsure, say N.
 
-config KMOD_BATMAN_ADV_DEBUG_LOG
+config BATMAN_ADV_DEBUG
        bool "B.A.T.M.A.N. debugging"
-       depends on KMOD_BATMAN_ADV_DEBUGFS
+       depends on PACKAGE_kmod-batman-adv
        help
          This is an option for use by developers; most people should
          say N here. This enables compilation of support for
          outputting debugging information to the kernel log. The
          output is controlled via the module parameter debug.
+
+config BATMAN_ADV_TRACING
+       bool "B.A.T.M.A.N. tracing support"
+       depends on PACKAGE_kmod-batman-adv
+       select KERNEL_FTRACE
+       select KERNEL_ENABLE_DEFAULT_TRACERS
+       help
+         This is an option for use by developers; most people should
+         say N here. Select this option to gather traces like the debug
+         messages using the generic tracing infrastructure of the kernel.
+         BATMAN_ADV_DEBUG must also be selected to get trace events for
+         batadv_dbg.