batman-adv: Disable MCAST during compilation

Message ID 20180717181108.2844-1-sven@narfation.org (mailing list archive)
State Accepted, archived
Delegated to: Simon Wunderlich
Headers
Series batman-adv: Disable MCAST during compilation |

Commit Message

Sven Eckelmann July 17, 2018, 6:11 p.m. UTC
  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(-)
  

Comments

Sven Eckelmann Sept. 14, 2018, 5:48 p.m. UTC | #1
On Dienstag, 17. Juli 2018 20:11:08 CEST Sven Eckelmann wrote:
> 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(-)

Applied as c79a99f58a26 [1]

Kind regards,
	Sven

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

Patch

diff --git a/Makefile b/Makefile
index 7c6fa1e4..04e2b723 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@  export CONFIG_BATMAN_ADV_DAT=y
 # 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 2faec155..8b363b10 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 5dcd875d..2aa9d8b6 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:="y"} >> "${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}"