From 14027c87b31b84a66ba859b164fa56b421f9efb7 Mon Sep 17 00:00:00 2001
From: pedro <pedro311@gmail.com>
Date: Tue, 8 Mar 2022 18:25:50 +0100
Subject: [PATCH] shared: defaults.c: remove unnecessary variable wanX_modem_if

---
 release/src-rt-6.x.4708/router/others/switch4g   | 5 ++---
 release/src-rt-6.x.4708/router/rc/dhcp.c         | 6 +-----
 release/src-rt-6.x.4708/router/shared/defaults.c | 4 ----
 release/src-rt-6.x.4708/router/shared/misc.c     | 4 ----
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/release/src-rt-6.x.4708/router/others/switch4g b/release/src-rt-6.x.4708/router/others/switch4g
index df9b747af7..9eb1eef0fc 100755
--- a/release/src-rt-6.x.4708/router/others/switch4g
+++ b/release/src-rt-6.x.4708/router/others/switch4g
@@ -42,7 +42,7 @@ connect() {
 	SPEED=$(NV "$PREFIX"_modem_speed)
 	BAND=$(NV "$PREFIX"_modem_band)
 	ROAMING=$(NV "$PREFIX"_modem_roam)
-	IFA=$(NV "$PREFIX"_modem_if)
+	IFA=$(NV "$PREFIX"_ifname)
 	local TTY DEVALL SYSCFGEX CGPADDR TXTLOG MODESPEED MODEROAM MODEBAND CONNECTED=0 COUNT=1 DONE=0 i
 	local SPEEDTXT ROAMTXT BANDTXT RESSPEED RSPEEDTXT RESROAM RROAMTXT RESBAND RBANDTXT
 
@@ -498,10 +498,9 @@ searchWAN() {
 	[ "$FOUND" -eq 1 ] && {
 		findType	# MODULE --> MTYPE
 
-		nvram set "$PREFIX"_modem_if="$WAN"
+		nvram set "$PREFIX"_ifname="$WAN"
 		nvram set "$PREFIX"_modem_type="$MTYPE"
 		$LOGS "4G MODEM WAN ($MTYPE) found - using $MODULE module and $WAN as WAN"
-		nvram set "$PREFIX"_iface="$WAN"
 	} || {
 		[ "$(NV mwan_cktime)" -gt 0 ] && {
 			watchdog add
diff --git a/release/src-rt-6.x.4708/router/rc/dhcp.c b/release/src-rt-6.x.4708/router/rc/dhcp.c
index 6a7973b109..cdee28862c 100644
--- a/release/src-rt-6.x.4708/router/rc/dhcp.c
+++ b/release/src-rt-6.x.4708/router/rc/dhcp.c
@@ -462,11 +462,7 @@ void start_dhcpc(char *prefix)
 	do_renew_file(1, prefix);
 
 	proto = get_wanx_proto(prefix);
-
-	if (proto == WP_LTE)
-		ifname = nvram_safe_get(strcat_r(prefix, "_modem_if", tmp));
-	else
-		ifname = nvram_safe_get(strcat_r(prefix, "_ifname", tmp));
+	ifname = nvram_safe_get(strcat_r(prefix, "_ifname", tmp));
 
 	if ((proto == WP_DHCP) || (proto == WP_LTE))
 		nvram_set(strcat_r(prefix, "_iface", tmp), ifname);
diff --git a/release/src-rt-6.x.4708/router/shared/defaults.c b/release/src-rt-6.x.4708/router/shared/defaults.c
index 467b45814e..71b20bce47 100644
--- a/release/src-rt-6.x.4708/router/shared/defaults.c
+++ b/release/src-rt-6.x.4708/router/shared/defaults.c
@@ -209,7 +209,6 @@ struct nvram_tuple router_defaults[] = {
 	{ "wan_modem_speed",		"00"				, 0 },
 	{ "wan_modem_band",		"7FFFFFFFFFFFFFFF"		, 0 },
 	{ "wan_modem_roam",		"2"				, 0 },
-	{ "wan_modem_if",		""				, 0 },
 	{ "wan_modem_type",		""				, 0 },
 
 	{ "wan2_modem_pin",		""				, 0 },
@@ -219,7 +218,6 @@ struct nvram_tuple router_defaults[] = {
 	{ "wan2_modem_speed",		"00"				, 0 },
 	{ "wan2_modem_band",		"7FFFFFFFFFFFFFFF"		, 0 },
 	{ "wan2_modem_roam",		"2"				, 0 },
-	{ "wan2_modem_if",		""				, 0 },
 	{ "wan2_modem_type",		""				, 0 },
 
 #ifdef TCONFIG_MULTIWAN
@@ -230,7 +228,6 @@ struct nvram_tuple router_defaults[] = {
 	{ "wan3_modem_speed",		"00"				, 0 },
 	{ "wan3_modem_band",		"7FFFFFFFFFFFFFFF"		, 0 },
 	{ "wan3_modem_roam",		"2"				, 0 },
-	{ "wan3_modem_if",		""				, 0 },
 	{ "wan3_modem_type",		""				, 0 },
 
 	{ "wan4_modem_pin",		""				, 0 },
@@ -240,7 +237,6 @@ struct nvram_tuple router_defaults[] = {
 	{ "wan4_modem_speed",		"00"				, 0 },
 	{ "wan4_modem_band",		"7FFFFFFFFFFFFFFF"		, 0 },
 	{ "wan4_modem_roam",		"2"				, 0 },
-	{ "wan4_modem_if",		""				, 0 },
 	{ "wan4_modem_type",		""				, 0 },
 #endif /* TCONFIG_MULTIWAN */
 #endif /* TCONFIG_USB */
diff --git a/release/src-rt-6.x.4708/router/shared/misc.c b/release/src-rt-6.x.4708/router/shared/misc.c
index 942bfdb967..2381c779e6 100644
--- a/release/src-rt-6.x.4708/router/shared/misc.c
+++ b/release/src-rt-6.x.4708/router/shared/misc.c
@@ -805,10 +805,6 @@ const wanface_list_t *get_wanfaces(char *prefix)
 				if (!(*iface))
 					iface = "ppp+";
 			}
-			else if (proto == WP_LTE) {
-				iface = nvram_safe_get(strlcat_r(prefix, "_modem_if", tmp, sizeof(tmp)));
-				nvram_set(strlcat_r(prefix, "_ifname", tmp, sizeof(tmp)), iface);
-			}
 			else {
 				iface = nvram_safe_get(strlcat_r(prefix, "_ifname", tmp, sizeof(tmp)));
 			}