From 1ed87c6df401e633c5889af7d32e4be71e2cd206 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 12 May 2017 15:43:31 +0200
Subject: [PATCH] gluon-mesh-batman-adv: enable bridge learning on bat0 again
Reverts d5829d87be8 ("gluon-mesh-batman-adv-core: disable bridge port
learning on bat0").
Fixes #1121
---
.../luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh | 2 +-
.../gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge | 6 ------
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh b/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh
index a4735316f..8153f0751 100755
--- a/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh
+++ b/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-mesh
@@ -34,7 +34,7 @@ uci:section('network', 'interface', 'bat0', {
auto = true,
macaddr = sysconfig.primary_mac,
multicast_router = 2,
- learning = false,
+ learning = true,
})
local interfaces = uci:get_list('network', 'client', 'ifname')
diff --git a/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge b/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge
index 5a956d4fd..2bfcdd57c 100755
--- a/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge
+++ b/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge
@@ -24,12 +24,6 @@ uci:section('network', 'interface', 'client', {
})
uci:delete('network', 'client_lan')
-if sysconfig.lan_ifname then
- uci:section('network', 'interface', 'client_lan', {
- unicast_flood = false,
- ifname = sysconfig.lan_ifname,
- })
-end
uci:delete('network', 'local_node_route6')
uci:section('network', 'route6', 'local_node_route6', {
--
GitLab