Hi,
yes, this is a rather harsh reminder that you should keep your settings in Kconfig and the out-of-tree module Makefiles in sync. Please submit an alternate patch (with a good commit message) for net/batman-adv/Kconfig when you want to keep the feature enabled by default.
Kind regards, Sven
Sven Eckelmann (2): batman-adv: Disable DAT during compilation batman-adv: Disable MCAST during compilation
Makefile | 4 ++-- README.external.rst | 4 ++-- gen-compat-autoconf.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
The distributed arp table compile option is disabled by default in the Kconfig of batman-adv. The out-of-tree module should keep this setting in sync and thus has to also disable the build of DAT by default.
Signed-off-by: Sven Eckelmann sven@narfation.org --- Makefile | 2 +- README.external.rst | 2 +- gen-compat-autoconf.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile index ea995216..85348893 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ export CONFIG_BATMAN_ADV_DEBUG=n # B.A.T.M.A.N. bridge loop avoidance: export CONFIG_BATMAN_ADV_BLA=y # B.A.T.M.A.N. distributed ARP table: -export CONFIG_BATMAN_ADV_DAT=y +export CONFIG_BATMAN_ADV_DAT=n # B.A.T.M.A.N network coding (catwoman): export CONFIG_BATMAN_ADV_NC=n # B.A.T.M.A.N. multicast optimizations: diff --git a/README.external.rst b/README.external.rst index a6f14a03..ac06faa9 100644 --- a/README.external.rst +++ b/README.external.rst @@ -46,7 +46,7 @@ module). Available options and their possible values are * ``CONFIG_BATMAN_ADV_DEBUGFS=[y|n*]`` (B.A.T.M.A.N. debugfs entries) * ``CONFIG_BATMAN_ADV_DEBUG=[y|n*]`` (B.A.T.M.A.N. debugging) * ``CONFIG_BATMAN_ADV_BLA=[y*|n]`` (B.A.T.M.A.N. bridge loop avoidance) - * ``CONFIG_BATMAN_ADV_DAT=[y*|n]`` (B.A.T.M.A.N. Distributed ARP Table) + * ``CONFIG_BATMAN_ADV_DAT=[y|n*]`` (B.A.T.M.A.N. Distributed ARP Table) * ``CONFIG_BATMAN_ADV_MCAST=[y*|n]`` (B.A.T.M.A.N. multicast optimizations) * ``CONFIG_BATMAN_ADV_NC=[y|n*]`` (B.A.T.M.A.N. Network Coding) * ``CONFIG_BATMAN_ADV_BATMAN_V=[y*|n]`` (B.A.T.M.A.N. V routing algorithm) diff --git a/gen-compat-autoconf.sh b/gen-compat-autoconf.sh index 5dcd875d..b498e6eb 100755 --- a/gen-compat-autoconf.sh +++ b/gen-compat-autoconf.sh @@ -55,7 +55,7 @@ gen_config() { gen_config 'CONFIG_BATMAN_ADV_DEBUGFS' ${CONFIG_BATMAN_ADV_DEBUGFS:="n"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_DEBUG' ${CONFIG_BATMAN_ADV_DEBUG:="n"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_BLA' ${CONFIG_BATMAN_ADV_BLA:="y"} >> "${TMP}" -gen_config 'CONFIG_BATMAN_ADV_DAT' ${CONFIG_BATMAN_ADV_DAT:="y"} >> "${TMP}" +gen_config 'CONFIG_BATMAN_ADV_DAT' ${CONFIG_BATMAN_ADV_DAT:="n"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_MCAST' ${CONFIG_BATMAN_ADV_MCAST:="y"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_NC' ${CONFIG_BATMAN_ADV_NC:="n"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_BATMAN_V' ${CONFIG_BATMAN_ADV_BATMAN_V:="y"} >> "${TMP}"
DAT (Distributed ARP Table) has been enabled by default in the out-of-tree batman-adv kernel module for several years already. It can now be enabled in the kernel too.
Signed-off-by: Antonio Quartulli a@unstable.cc ---
This patch will obviously confict with ("batman-adv: Remove "default n" in Kconfig")
net/batman-adv/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index de8034d8..770894eb 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -60,7 +60,7 @@ config BATMAN_ADV_BLA config BATMAN_ADV_DAT bool "Distributed ARP Table" depends on BATMAN_ADV && INET - default n + default y help This option enables DAT (Distributed ARP Table), a DHT based mechanism that increases ARP reliability on sparse wireless
On Sonntag, 3. Juni 2018 12:52:03 CEST Antonio Quartulli wrote:
DAT (Distributed ARP Table) has been enabled by default in the out-of-tree batman-adv kernel module for several years already. It can now be enabled in the kernel too.
Signed-off-by: Antonio Quartulli a@unstable.cc
Added as ab4e58534dee [1]
Thanks, Sven
[1] https://git.open-mesh.org/batman-adv.git/commit/5d454c9eb1cce80ca441a3daaf73...
The multicast optimization compile option is disabled by default in the Kconfig of batman-adv. The out-of-tree module should keep this setting in sync and thus has to also disable the build of multicast optimization by default.
Signed-off-by: Sven Eckelmann sven@narfation.org --- Makefile | 2 +- README.external.rst | 2 +- gen-compat-autoconf.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile index 85348893..e57fbddd 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ export CONFIG_BATMAN_ADV_DAT=n # B.A.T.M.A.N network coding (catwoman): export CONFIG_BATMAN_ADV_NC=n # B.A.T.M.A.N. multicast optimizations: -export CONFIG_BATMAN_ADV_MCAST=y +export CONFIG_BATMAN_ADV_MCAST=n # B.A.T.M.A.N. V routing algorithm (experimental): export CONFIG_BATMAN_ADV_BATMAN_V=y
diff --git a/README.external.rst b/README.external.rst index ac06faa9..31c153f4 100644 --- a/README.external.rst +++ b/README.external.rst @@ -47,7 +47,7 @@ module). Available options and their possible values are * ``CONFIG_BATMAN_ADV_DEBUG=[y|n*]`` (B.A.T.M.A.N. debugging) * ``CONFIG_BATMAN_ADV_BLA=[y*|n]`` (B.A.T.M.A.N. bridge loop avoidance) * ``CONFIG_BATMAN_ADV_DAT=[y|n*]`` (B.A.T.M.A.N. Distributed ARP Table) - * ``CONFIG_BATMAN_ADV_MCAST=[y*|n]`` (B.A.T.M.A.N. multicast optimizations) + * ``CONFIG_BATMAN_ADV_MCAST=[y|n*]`` (B.A.T.M.A.N. multicast optimizations) * ``CONFIG_BATMAN_ADV_NC=[y|n*]`` (B.A.T.M.A.N. Network Coding) * ``CONFIG_BATMAN_ADV_BATMAN_V=[y*|n]`` (B.A.T.M.A.N. V routing algorithm)
diff --git a/gen-compat-autoconf.sh b/gen-compat-autoconf.sh index b498e6eb..fa985268 100755 --- a/gen-compat-autoconf.sh +++ b/gen-compat-autoconf.sh @@ -56,7 +56,7 @@ gen_config 'CONFIG_BATMAN_ADV_DEBUGFS' ${CONFIG_BATMAN_ADV_DEBUGFS:="n"} >> "${T gen_config 'CONFIG_BATMAN_ADV_DEBUG' ${CONFIG_BATMAN_ADV_DEBUG:="n"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_BLA' ${CONFIG_BATMAN_ADV_BLA:="y"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_DAT' ${CONFIG_BATMAN_ADV_DAT:="n"} >> "${TMP}" -gen_config 'CONFIG_BATMAN_ADV_MCAST' ${CONFIG_BATMAN_ADV_MCAST:="y"} >> "${TMP}" +gen_config 'CONFIG_BATMAN_ADV_MCAST' ${CONFIG_BATMAN_ADV_MCAST:="n"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_NC' ${CONFIG_BATMAN_ADV_NC:="n"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_BATMAN_V' ${CONFIG_BATMAN_ADV_BATMAN_V:="y"} >> "${TMP}"
b.a.t.m.a.n@lists.open-mesh.org
-
Antonio Quartulli -
Sven Eckelmann