From eed0705407e71b3963eed9987adcb82b0b3e448b Mon Sep 17 00:00:00 2001 From: Robert Langhammer Date: Sat, 28 Jul 2018 23:58:28 +0200 Subject: [PATCH] Remove batman option no_rebroadcast MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This sysfs option no longer exists. The no_rebroadcast option was used as part of gluon’s batman-adv-legacy implementation, after open-mesh decided to not include it into batman-adv v14: https://patchwork.open-mesh.org/patch/3434/ Our firmware has included (and enabled) it since December 2013. With the upgrade to batman-adv v15 (pulled from openwrt-routing then) in October 2017, the custom patch was no longer included. It looks like open-mesh provides an equivalent built-in solution now: https://git.open-mesh.org/batman-adv.git/commit/a00797d8fa8fd1471e8be1ac23d506f76d866aaa Thus, the option can be removed. Signed-off-by: Robert Langhammer Reviewed-by: Christian Dresel --- src/packages/fff/fff-fastd/files/etc/uci-defaults/55_fff-fastd | 1 - .../fff-tunneldigger/files/etc/tunneldigger/tunneldigger.hook | 1 - 2 files changed, 2 deletions(-) diff --git a/src/packages/fff/fff-fastd/files/etc/uci-defaults/55_fff-fastd b/src/packages/fff/fff-fastd/files/etc/uci-defaults/55_fff-fastd index 72970bd..d53eb43 100644 --- a/src/packages/fff/fff-fastd/files/etc/uci-defaults/55_fff-fastd +++ b/src/packages/fff/fff-fastd/files/etc/uci-defaults/55_fff-fastd @@ -22,6 +22,5 @@ EOF ln -s /tmp/fastd_fff_peers /etc/fastd/fff/peers echo "#!/bin/sh" > /etc/fastd/fff/up.sh echo "ip link set up dev fffVPN" >> /etc/fastd/fff/up.sh -echo "echo enable > /sys/devices/virtual/net/fffVPN/batman_adv/no_rebroadcast" >> /etc/fastd/fff/up.sh echo "batctl if add fffVPN" >> /etc/fastd/fff/up.sh chmod +x /etc/fastd/fff/up.sh diff --git a/src/packages/fff/fff-tunneldigger/files/etc/tunneldigger/tunneldigger.hook b/src/packages/fff/fff-tunneldigger/files/etc/tunneldigger/tunneldigger.hook index c4fea62..a96b42c 100755 --- a/src/packages/fff/fff-tunneldigger/files/etc/tunneldigger/tunneldigger.hook +++ b/src/packages/fff/fff-tunneldigger/files/etc/tunneldigger/tunneldigger.hook @@ -6,5 +6,4 @@ INTERFACE=$2 if [ "$HOOK" = session.up ]; then ip l s dev $INTERFACE up batctl if add $INTERFACE - echo "enabled" > /sys/devices/virtual/net/$INTERFACE/batman_adv/no_rebroadcast fi