Merge pull request #1045 from ecsv/batadv-2024.0

batman-adv: Provide teardown hook for batadv_vlan proto

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index cbcf316ebce4f2175e8266ab6f949cf0ae8fed4c..2fed73affb4589d8dbfb4ad3312e121aeb52677a 100644 (file)
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
 PKG_VERSION:=2024.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

diff --git a/batman-adv/files/lib/netifd/proto/batadv_vlan.sh b/batman-adv/files/lib/netifd/proto/batadv_vlan.sh
index 115e61cde75137d62f236fe6391b696ad76e307e..5b0c76fd2efcdeb46765792dcbb43c741665372b 100755 (executable)
--- a/batman-adv/files/lib/netifd/proto/batadv_vlan.sh
+++ b/batman-adv/files/lib/netifd/proto/batadv_vlan.sh
@@ -22,4 +22,8 @@ proto_batadv_vlan_setup() {
        proto_send_update "$config"
 }
 
+proto_batadv_vlan_teardown() {
+       local cfg="$1"
+}
+
 add_protocol batadv_vlan