From 6f4ada85c8d51885dd85dc580c590a005fd5c60c Mon Sep 17 00:00:00 2001
From: 4ndr3 <andre@hamburg.freifunk.net>
Date: Tue, 20 Mar 2018 19:09:53 +0100
Subject: [PATCH] =?UTF-8?q?kumo=20&=20sumo=20vlans=20zu=20fux-kern=20hinzu?=
 =?UTF-8?q?gef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Richtfunk/bb-fux-kern/etc/config/network | 76 ++++++++++++++++--------
 1 file changed, 51 insertions(+), 25 deletions(-)

diff --git a/Richtfunk/bb-fux-kern/etc/config/network b/Richtfunk/bb-fux-kern/etc/config/network
index 71e3f58..29c8ae8 100644
--- a/Richtfunk/bb-fux-kern/etc/config/network
+++ b/Richtfunk/bb-fux-kern/etc/config/network
@@ -132,7 +132,7 @@ config switch_vlan
 	option ports '0t 2t'
 	option device 'switch0'
 
-config interface 'zeise26'
+config interface 'kuno'
 	option ifname 'eth0.20'
 	option macaddr 'de:ad:be:ef:90:14'
 	option proto 'gluon_mesh'
@@ -205,6 +205,19 @@ config interface 'fcsp'
 	option transitive '1'
 	option igmp_snooping '0'
 
+config switch_vlan                        
+        option vlan '36'                  
+        option ports '0t 2t'              
+        option device 'switch0'           
+                                          
+config interface 'sumo'                   
+        option ifname 'eth0.36'           
+        option macaddr 'de:ad:be:ef:90:1a'
+        option proto 'gluon_mesh'         
+        option fixed_mtu '1'              
+        option transitive '1'             
+        option igmp_snooping '0'          
+ 
 config interface 'wan'
 	option ifname 'eth0.2'
 	option type 'bridge'
@@ -213,20 +226,7 @@ config interface 'wan'
 	option auto '1'
 	option multicast_querier '0'
 	option macaddr 'c2:0d:9f:de:d0:90'
-
-config interface 'client'
-	option type 'bridge'
-	option proto 'dhcpv6'
-	option reqprefix 'no'
-	option macaddr 'f8:1a:67:d8:df:d2'
-	option peerdns '1'
-	option robustness '3'
-	option query_interval '2000'
-	option query_response_interval '500'
-	option sourcefilter '0'
-	list ifname 'eth0.1'
-	list ifname 'eth0.6'
-	list ifname 'bat0'
+	option igmp_snooping '1'
 
 config interface 'mesh_vpn'
 	option ifname 'mesh-vpn'
@@ -235,6 +235,7 @@ config interface 'mesh_vpn'
 	option macaddr 'c2:0d:9f:de:d0:97'
 	option fixed_mtu '1'
 	option proto 'gluon_mesh'
+	option mtu '1312'
 
 config interface 'wan6'
 	option proto 'dhcpv6'
@@ -284,26 +285,51 @@ config interface 'mesh_radio0'
 config interface 'mesh_radio1'
 	option proto 'gluon_mesh'
 
-config interface 'bat0'
-	option multicast_router '2'
-	option ifname 'bat0'
+config interface 'client'
+	option igmp_snooping '1'
+	option type 'bridge'
+	option auto '1'
+	option multicast_querier '1'
 	option macaddr 'f8:1a:67:d8:df:d2'
-	option learning '1'
-	option proto 'none'
+	list ifname 'eth0.1'
+	list ifname 'eth0.6'
+	list ifname 'bat0'
+	list ifname 'local-port'
+	option ipv6 '1'
+	option keep_ra_dnslifetime '1'
+	option sourcefilter '0'
+	option peerdns '1'
+	option robustness '3'
+	option reqprefix 'no'
+	option query_interval '2000'
+	option query_response_interval '500'
+	option proto 'dhcpv6'
 
 config device 'local_node_dev'
-	option macaddr '16:41:95:40:f7:dc'
-	option ifname 'br-client'
+	option type 'veth'
 	option name 'local-node'
-	option type 'macvlan'
+	option peer_name 'local-port'
+	option macaddr '16:41:95:40:f7:dc'
+	option peer_macaddr 'f8:1a:67:d8:df:d2'
 
 config interface 'local_node'
 	option ifname 'local-node'
-	option ipaddr '10.112.96.1'
+	option ipaddr '10.112.96.1/19'
 	option ip6addr '2a03:2267:2::1/128'
-	option netmask '255.255.224.0'
+	option ip6deprecated '1'
 	option proto 'static'
 
+config interface 'gluon_bat0'
+	option proto 'gluon_bat0'
+
+config interface 'bat0'
+	option multicast_router '2'
+	option ifname 'bat0'
+	option auto '1'
+	option macaddr 'f8:1a:67:d8:df:d2'
+	option learning '1'
+	option proto 'none'
+
 config route6 'local_node_route6'
 	option target '2a03:2267:2::/64'
 	option gateway '::'