mark
/
firmware
forked from freifunk-franken/firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

batman-adv: Split batadv proto in meshif and hardif part 

This migrates to the new configuration architecture introduced
and required in
54af5a209e

This is a side-effect of the switch to openwrt-19.07.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
[fabian@blaese.de: Rebase onto fff firmware master]
Signed-off-by: Fabian Bläse <fabian@blaese.de>
This commit is contained in:
Adrian Schmutzler 2019-03-19 19:43:49 +01:00 committed by Fabian Bläse
parent 68f9bae58f
commit 9f25f5dc35
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/packages/fff/fff-batman-adv/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-batman-adv
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

26
src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batman-adv
View File

@ -1,20 +1,20 @@
#!/bin/sh
uci batch <<EOF
delete batman-adv.bat0
set batman-adv.bat0=mesh
set batman-adv.bat0.gw_mode='client'
set batman-adv.bat0.gw_sel_class='1'
set batman-adv.bat0.network_coding='0'
set batman-adv.bat0.aggregated_ogms='1'
set batman-adv.bat0.ap_isolation='0'
set batman-adv.bat0.bonding='0'
set batman-adv.bat0.fragmentation='1'
set batman-adv.bat0.orig_interval='1000'
set batman-adv.bat0.distributed_arp_table='1'
set batman-adv.bat0.hop_penalty='30'
set network.bat0=interface
set network.bat0.proto=batadv
set network.bat0.gw_mode='client'
set network.bat0.gw_sel_class='1'
set network.bat0.network_coding='0'
set network.bat0.aggregated_ogms='1'
set network.bat0.ap_isolation='0'
set network.bat0.bonding='0'
set network.bat0.fragmentation='1'
set network.bat0.orig_interval='1000'
set network.bat0.distributed_arp_table='1'
set network.bat0.hop_penalty='30'
EOF
uci commit
uci commit network
exit 0

2
src/packages/fff/fff-network/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-network
PKG_RELEASE:=12
PKG_RELEASE:=13
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

4
src/packages/fff/fff-network/files/etc/config/network
View File

@ -13,5 +13,5 @@ config interface 'wan'
option ifname 'eth1'
config interface 'ethmesh'
option proto 'batadv'
option mesh 'bat0'
option proto 'batadv_hardif'
option master 'bat0'

2
src/packages/fff/fff-wireless/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-wireless
PKG_RELEASE:=14
PKG_RELEASE:=15
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

4
src/packages/fff/fff-wireless/files/etc/uci-defaults/24a-fff-wireless
View File

@ -41,8 +41,8 @@ configWifiDevice() {
set network.w${freq}mesh='interface'
set network.w${freq}mesh.mtu='1560'
set network.w${freq}mesh.proto='batadv'
set network.w${freq}mesh.mesh='bat0'
set network.w${freq}mesh.proto='batadv_hardif'
set network.w${freq}mesh.master='bat0'
set wireless.w${freq}mesh='wifi-iface'
set wireless.w${freq}mesh.device='${radio}'