From 2b4d9b3b8a993db4623405be8b32cc43ef5cb588 Mon Sep 17 00:00:00 2001
From: OpenFest Server User <core@openfest.org>
Date: Tue, 11 Oct 2022 15:16:05 +0300
Subject: [PATCH] dap: fix network/vlans

---
 files/dap2965-single-trunk/etc/config/network | 115 +++++++++---------
 1 file changed, 60 insertions(+), 55 deletions(-)

diff --git a/files/dap2965-single-trunk/etc/config/network b/files/dap2965-single-trunk/etc/config/network
index 2d80f01..1f82bea 100644
--- a/files/dap2965-single-trunk/etc/config/network
+++ b/files/dap2965-single-trunk/etc/config/network
@@ -1,14 +1,14 @@
 config interface 'loopback'
-        option ifname 'lo'
+        option device 'lo'
         option proto 'static'
         option ipaddr '127.0.0.1'
         option netmask '255.0.0.0'
 
 
-config device                 
-        option name 'br-lan'  
-        option type 'bridge'  
-        option ipv6 '0'       
+config device
+        option name 'br-lan'
+        option type 'bridge'
+        option ipv6 '0'
         list ports 'eth0'
 
 config interface 'management'
@@ -20,56 +20,61 @@ config interface 'management'
         option dns '10.20.0.1'
         option ipv6 'no'
 
+config switch
+        option name 'switch0'
+        option reset '1'
+        option enable_vlan '0'
 
-config bridge-vlan                 
-        option device 'br-lan'     
-        option vlan '1'            
-        list ports 'eth0'          
-                                   
-config bridge-vlan                 
-        option device 'br-lan'     
-        option vlan '20'           
-        list ports 'eth0:t'        
-                                   
-config bridge-vlan                 
-        option device 'br-lan'     
-        option vlan '21'           
-        list ports 'eth0:t'        
-                                   
-config bridge-vlan                 
-        option device 'br-lan'     
-        option vlan '23'           
-        list ports 'eth0:t'        
+config switch_vlan
+        option device 'switch0'
+        option vlan '1'
+        option ports '2 0'
 
-config interface 'userwifi'         
-        option proto 'none'         
-        option device 'br-lan.21'   
-        option defaultroute '0'     
-        option peerdns '0'          
-        option delegate '0'         
-                                    
-config interface 'videowifi'        
-        option proto 'none'         
-        option device 'br-lan.23'   
-        option defaultroute '0'     
-        option peerdns '0'          
-        option delegate '0'         
-                                    
-config device                       
-        option name 'br-lan.20'     
-        option type '8021q'         
-        option ifname 'br-lan'      
-        option vid '20'             
-                                    
-config device                       
-        option name 'br-lan.21'     
-        option type '8021q'         
-        option ifname 'br-lan'      
-        option vid '21'             
-                                    
-config device                       
-        option name 'br-lan.23'     
-        option type '8021q'         
-        option ifname 'br-lan'      
-        option vid '23'             
+
+config bridge-vlan
+        option device 'br-lan'
+        option vlan '20'
+        list ports 'eth0:t'
+
+config bridge-vlan
+        option device 'br-lan'
+        option vlan '21'
+        list ports 'eth0:t'
+
+config bridge-vlan
+        option device 'br-lan'
+        option vlan '23'
+        list ports 'eth0:t'
+
+config interface 'userwifi'
+        option proto 'none'
+        option device 'br-lan.21'
+        option defaultroute '0'
+        option peerdns '0'
+        option delegate '0'
+
+config interface 'videowifi'
+        option proto 'none'
+        option device 'br-lan.23'
+        option defaultroute '0'
+        option peerdns '0'
+        option delegate '0'
+
+config device
+        option name 'br-lan.20'
+        option type '8021q'
+        option ifname 'br-lan'
+        option vid '20'
+
+config device
+        option name 'br-lan.21'
+        option type '8021q'
+        option ifname 'br-lan'
+        option vid '21'
+
+config device
+        option name 'br-lan.23'
+        option type '8021q'
+        option ifname 'br-lan'
+        option vid '23'