From 680ee18f6699d76b610b03a3cd84d92528dd37e2 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 28 Jun 2022 14:08:55 +0200
Subject: [PATCH] Simplify RUTX modem config

---
 .../files/etc/uci-defaults/1920-omr-network   | 29 +++++--------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/openmptcprouter/files/etc/uci-defaults/1920-omr-network b/openmptcprouter/files/etc/uci-defaults/1920-omr-network
index bdb6a12c7..ee5922803 100755
--- a/openmptcprouter/files/etc/uci-defaults/1920-omr-network
+++ b/openmptcprouter/files/etc/uci-defaults/1920-omr-network
@@ -357,18 +357,10 @@ if [ "$board" = "teltonika,rutx" ] && [ -f /sbin/mnf_info ]; then
 	set network.modem1.force_link='1'
 	set network.modem1.device='/sys/devices/platform/soc/60f8800.usb2/6000000.dwc3/xhci-hcd.1.auto/usb3/3-1'
 	set network.modem1.peerdns='0'
-	set network.wan_modem1=interface
-	set network.wan_modem1.proto='dhcp'
-	set network.wan_modem1.device='wwan0'
-	set network.wan_modem1.force_link='1'
-	set network.wan_modem1.multipath='on'
-	set network.wan_modem1.addlatency='0'
-	set network.wan_modem1.hostname='*'
-	set network.wan_modem1.defaultroute='0'
-	set network.wan_modem1.peerdns='0'
-	set network.wan_modem1.ip4table=wan
+	set network.modem1.multipath='on'
+	set network.modem1.defaultroute='0'
 	commit network
-	add_list firewall.@zone[1].network='wan_modem1'
+	add_list firewall.@zone[1].network='modem1'
 	commit firewall
 	EOF
 	if [ "$(mnf_info -n)" = "RUTX1200XXXX" ]; then
@@ -382,18 +374,11 @@ if [ "$board" = "teltonika,rutx" ] && [ -f /sbin/mnf_info ]; then
 		set network.modem2.force_link='1'
 		set network.modem2.device='/sys/devices/platform/soc/8af8800.usb3/8a00000.dwc3/xhci-hcd.0.auto/usb1/1-1/1-1.2'
 		set network.modem2.peerdns='0'
-		set network.wan_modem2=interface
-		set network.wan_modem2.proto='dhcp'
-		set network.wan_modem2.device='wwan1'
-		set network.wan_modem2.force_link='1'
-		set network.wan_modem2.multipath='on'
-		set network.wan_modem2.addlatency='0'
-		set network.wan_modem2.hostname='*'
-		set network.wan_modem2.defaultroute='0'
-		set network.wan_modem2.peerdns='0'
-		set network.wan_modem2.ip4table=wan
+		set network.modem2.multipath='on'
+		set network.modem2.defaultroute='0'
+		set network.modem2.ip4table=wan
 		commit network
-		add_list firewall.@zone[1].network='wan_modem2'
+		add_list firewall.@zone[1].network='modem2'
 		commit firewall
 		EOF
 	fi