From 9f25f5dc35ce7bb81b5b127c020e23f57a849ca7 Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Tue, 19 Mar 2019 19:43:49 +0100
Subject: [PATCH] batman-adv: Split batadv proto in meshif and hardif part
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This migrates to the new configuration architecture introduced
and required in
https://github.com/openwrt-routing/packages/commit/54af5a209e0a0a75b5eb712c0ca8056e66de02c0

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>
---
 src/packages/fff/fff-batman-adv/Makefile      |  2 +-
 .../files/etc/uci-defaults/93-fff-batman-adv  | 26 +++++++++----------
 src/packages/fff/fff-network/Makefile         |  2 +-
 .../fff/fff-network/files/etc/config/network  |  4 +--
 src/packages/fff/fff-wireless/Makefile        |  2 +-
 .../files/etc/uci-defaults/24a-fff-wireless   |  4 +--
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/packages/fff/fff-batman-adv/Makefile b/src/packages/fff/fff-batman-adv/Makefile
index 9ef58042..9d553dc0 100644
--- a/src/packages/fff/fff-batman-adv/Makefile
+++ b/src/packages/fff/fff-batman-adv/Makefile
@@ -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)
 
diff --git a/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batman-adv b/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batman-adv
index 93c822c5..a3d1192e 100644
--- a/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batman-adv
+++ b/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batman-adv
@@ -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
diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile
index 95f99e52..31928de8 100644
--- a/src/packages/fff/fff-network/Makefile
+++ b/src/packages/fff/fff-network/Makefile
@@ -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)
 
diff --git a/src/packages/fff/fff-network/files/etc/config/network b/src/packages/fff/fff-network/files/etc/config/network
index c4909333..d2ee4438 100644
--- a/src/packages/fff/fff-network/files/etc/config/network
+++ b/src/packages/fff/fff-network/files/etc/config/network
@@ -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'
diff --git a/src/packages/fff/fff-wireless/Makefile b/src/packages/fff/fff-wireless/Makefile
index e805ea22..02328a2b 100644
--- a/src/packages/fff/fff-wireless/Makefile
+++ b/src/packages/fff/fff-wireless/Makefile
@@ -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)
 
diff --git a/src/packages/fff/fff-wireless/files/etc/uci-defaults/24a-fff-wireless b/src/packages/fff/fff-wireless/files/etc/uci-defaults/24a-fff-wireless
index 3f28ae01..57e71927 100644
--- a/src/packages/fff/fff-wireless/files/etc/uci-defaults/24a-fff-wireless
+++ b/src/packages/fff/fff-wireless/files/etc/uci-defaults/24a-fff-wireless
@@ -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}'