From 97f44c208b4dd23a63a0069963ca04fad899bf05 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 12 May 2017 15:46:44 +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
---
 .../gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh  | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh
index 4710d47c8..1c263ab78 100755
--- a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh
+++ b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh
@@ -43,19 +43,11 @@ uci:section('network', 'interface', 'bat0',
 		    proto = 'none',
 		    macaddr = sysconfig.primary_mac,
 		    multicast_router = 2,
-		    learning = 0,
+		    learning = 1,
 	    }
 )
 
 uci:delete('network', 'client_lan')
-if sysconfig.lan_ifname then
-	uci:section('network', 'interface', 'client_lan',
-		    {
-			    unicast_flood = 0,
-		    }
-	)
-	uci:set('network', 'client_lan', 'ifname', sysconfig.lan_ifname)
-end
 
 uci:save('network')
 
-- 
GitLab