[linux-next] LinuxNextTracking branch, master, updated. next-20180719

batman at open-mesh.org batman at open-mesh.org
Fri Jul 20 00:16:44 CEST 2018

The following commit has been merged in the master branch:
commit 55f949c4fa6cefb199fd6208c275a3457e39e4bc
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat May 26 11:40:31 2018 +0200

    batman-adv: Remove "default n" in Kconfig
    The "default n" is the default value for any bool or tristate Kconfig
    setting. It is therefore not necessary to add it to a config entry.
    Reported-by: Sergei Shtylyov <sergei.shtylyov at cogentembedded.com>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig
index ff38df8bab91..361116f77cb9 100644
--- a/net/batman-adv/Kconfig
+++ b/net/batman-adv/Kconfig
@@ -24,7 +24,6 @@ config BATMAN_ADV
 	depends on NET
 	select CRC16
 	select LIBCRC32C
-        default n
           B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is
           a routing protocol for multi-hop ad-hoc mesh networks. The
@@ -70,7 +69,6 @@ config BATMAN_ADV_DAT
 	bool "Network Coding"
 	depends on BATMAN_ADV
-	default n
 	  This option enables network coding, a mechanism that aims to
 	  increase the overall network throughput by fusing multiple
@@ -84,7 +82,6 @@ config BATMAN_ADV_NC
 	bool "Multicast optimisation"
 	depends on BATMAN_ADV && INET && !(BRIDGE=m && BATMAN_ADV=y)
-	default n
 	  This option enables the multicast optimisation which aims to
 	  reduce the air overhead while improving the reliability of
@@ -94,7 +91,6 @@ config BATMAN_ADV_DEBUGFS
 	bool "batman-adv debugfs entries"
 	depends on BATMAN_ADV
 	depends on DEBUG_FS
-	default n
 	  Enable this to export routing related debug tables via debugfs.
 	  The information for each soft-interface and used hard-interface can be


More information about the linux-merge mailing list