From b957de0e16c0982b1c83cdd593dd9fd589b74f18 Mon Sep 17 00:00:00 2001
From: DHDAXCW <lasstp5011@gmail.com>
Date: Fri, 10 May 2024 09:35:58 +0800
Subject: [PATCH] sync update

---
 package/wwan/luci-app-modem/Makefile               | 14 ++++++++++----
 package/wwan/luci-app-modem/root/etc/init.d/modem  |  5 +++--
 .../root/usr/share/modem/modem_network_task.sh     |  4 ++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/package/wwan/luci-app-modem/Makefile b/package/wwan/luci-app-modem/Makefile
index 1dbc80a43..64a61a6fa 100644
--- a/package/wwan/luci-app-modem/Makefile
+++ b/package/wwan/luci-app-modem/Makefile
@@ -10,16 +10,22 @@ PKG_VERSION:=1.4.4
 PKG_LICENSE:=GPLv3
 PKG_LINCESE_FILES:=LICENSE
 PKF_MAINTAINER:=Siriling <siriling@qq.com>
-LUCI_DEPENDS:=+luci-compat +kmod-usb-net +kmod-usb-net-cdc-ether +kmod-usb-acm \
-		+kmod-usb-net-qmi-wwan +kmod-usb-net-rndis +kmod-usb-serial-qualcomm \
-		+kmod-usb-net-sierrawireless +kmod-usb-ohci +kmod-usb-serial \
-		+kmod-usb-serial-option +kmod-usb-wdm \
+LUCI_DEPENDS:=+luci-compat \
 		+kmod-usb2 +kmod-usb3 \
+		+kmod-usb-net-sierrawireless +kmod-usb-ohci \
+		+kmod-usb-serial-option +kmod-usb-serial +kmod-usb-serial-qualcomm \
+		+kmod-usb-net +kmod-usb-acm \
+		+kmod-usb-wdm +kmod-usb-net-qmi-wwan \
+		+kmod-usb-net-cdc-ether \
 		+kmod-usb-net-cdc-mbim \
+		+kmod-usb-net-rndis \
+		kmod-usb-net-cdc-ncm kmod-usb-net-huawei-cdc-ncm\
 		+usbutils \
 		+kmod-pcie_mhi \
 		+pciutils \
 		+quectel-CM-5G \
+		+modemmanager \
+		+luci-proto-modemmanager \
 		+sms-tool \
 		+jq
 
diff --git a/package/wwan/luci-app-modem/root/etc/init.d/modem b/package/wwan/luci-app-modem/root/etc/init.d/modem
index e93bb078c..4371594ef 100755
--- a/package/wwan/luci-app-modem/root/etc/init.d/modem
+++ b/package/wwan/luci-app-modem/root/etc/init.d/modem
@@ -780,6 +780,9 @@ service_triggers()
 
 start_service() {
 
+	#加载模组配置
+	config_load modem
+
 	#统计模组数量
 	modem_count=0
 	config_foreach count_modem_number "modem-device"
@@ -787,8 +790,6 @@ start_service() {
 	uci set modem.@global[0].modem_number=${modem_count}
 	uci commit modem
 
-	#加载模组配置
-	config_load modem
 	#手动设置模组信息
 	config_foreach manual_set_modem_config "modem-device"
 
diff --git a/package/wwan/luci-app-modem/root/usr/share/modem/modem_network_task.sh b/package/wwan/luci-app-modem/root/usr/share/modem/modem_network_task.sh
index ae1faf1d8..9921f7aa3 100755
--- a/package/wwan/luci-app-modem/root/usr/share/modem/modem_network_task.sh
+++ b/package/wwan/luci-app-modem/root/usr/share/modem/modem_network_task.sh
@@ -87,7 +87,7 @@ gobinet_dial()
     elif [ "$manufacturer" = "fibocom" ]; then
         at_command='AT$QCRMCALL=1,3'
     elif [ "$manufacturer" = "meig" ]; then
-		at_command="ATI"
+        at_command="ATI"
     else
         at_command='ATI'
     fi
@@ -122,7 +122,7 @@ ecm_dial()
     elif [ "$manufacturer" = "fibocom" ]; then
         at_command="AT+GTRNDIS=1,${define_connect}"
     elif [ "$manufacturer" = "meig" ]; then
-		at_command="AT$QCRMCALL=1,1,${define_connect},2,1"
+        at_command="AT$QCRMCALL=1,1,${define_connect},2,1"
     else
         at_command='ATI'
     fi