Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 24984968965eb3f7f1a7466ac1ae34447500399c Author: Sven Eckelmann sven@narfation.org Date: Tue Nov 6 09:35:51 2018 +0100

batman-adv: Revert "Disable MCAST during compilation"

This reverts commit c79a99f58a26 ("batman-adv: Disable MCAST during compilation"). The option will be enabled in net-next in the upcoming weeks. Just disabling multicast for a single release in the out-of-tree module is therefore not necessary.

Signed-off-by: Sven Eckelmann sven@narfation.org

24984968965eb3f7f1a7466ac1ae34447500399c 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 f9c4bf4..d665c0b 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=n +export CONFIG_BATMAN_ADV_MCAST=y # B.A.T.M.A.N. tracing support: export CONFIG_BATMAN_ADV_TRACING=n # B.A.T.M.A.N. V routing algorithm (experimental): diff --git a/README.external.rst b/README.external.rst index a678ae8..0e02777 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_TRACING=[y|n*]`` (B.A.T.M.A.N. tracing support) * ``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 e5aa915..a4eb113 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:="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_TRACING' ${CONFIG_BATMAN_ADV_TRACING:="n"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_BATMAN_V' ${CONFIG_BATMAN_ADV_BATMAN_V:="y"} >> "${TMP}"