batman-adv: Default build sync with Kconfig

RFC New Sven Eckelmann 2 participants 5 messages May 25, 2018 – Jul 17, 2018

Subsystems (2)

Kbuild Batman advanced

lore

Share & tools

lore

Sven Eckelmann

author maintainer

2018-05-25 20:03 UTC #0 lore raw

cover batman-adv: Default build sync with Kconfig

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(-)

Signature · 1 line

2.17.0

Sven Eckelmann

author maintainer

2018-05-25 20:03 UTC #1 lore raw

RFC 1/2 batman-adv: Disable DAT during compilation

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 <[email protected]>

---
 Makefile               | 2 +-
 README.external.rst    | 2 +-
 gen-compat-autoconf.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Makefile +1 -1

index ea995216..85348893 100644
@@ -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:

README.external.rst +1 -1

index a6f14a03..ac06faa9 100644
@@ -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)

gen-compat-autoconf.sh +1 -1

index 5dcd875d..b498e6eb 100755
@@ -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}"

Signature · 1 line

2.17.0

Antonio Quartulli

2018-06-03 10:52 UTC #2 lore raw

PATCH 1/1 batman-adv: enable DAT by default at compile time

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 <[email protected]>

---

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(-)

net/batman-adv/Kconfig +1 -1

index de8034d8..770894eb 100644
@@ -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

Signature · 1 line

2.17.1

Sven Eckelmann

author maintainer

2018-07-17 17:59 UTC #3 lore raw

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: enable DAT by default at compile time

Quoted 7 lines · 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 <[email protected]>
---

Added as ab4e58534dee [1]

Thanks,
Sven

[1] https://git.open-mesh.org/batman-adv.git/commit/5d454c9eb1cce80ca441a3daaf73062f816bd082

Sven Eckelmann

author maintainer

2018-05-25 20:03 UTC #4 lore raw

RFC 2/2 batman-adv: Disable MCAST during compilation

In reply to Sven Eckelmann

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 <[email protected]>

---
 Makefile               | 2 +-
 README.external.rst    | 2 +-
 gen-compat-autoconf.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Makefile +1 -1

index 85348893..e57fbddd 100644
@@ -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

README.external.rst +1 -1

index ac06faa9..31c153f4 100644
@@ -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)

gen-compat-autoconf.sh +1 -1

index b498e6eb..fa985268 100755
@@ -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}"

Signature · 1 line

2.17.0