sync

package/wwan/luci-app-modem/Makefile

@@ -13,15 +13,13 @@ PKF_MAINTAINER:=Siriling <siriling@qq.com>
 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-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 \
+		+kmod-usb-net-cdc-ncm +kmod-usb-net-huawei-cdc-ncm \
 		+usbutils \
 		+kmod-pcie_mhi \
 		+pciutils \

package/wwan/luci-app-modem/root/etc/init.d/modem

@@ -620,13 +620,22 @@ dial()
 	[ -z "${modem_no}" ] && return 0
 	
 	#获取模组的拨号模式
+	local time=0
 	local mode
-	while true; do
+	while [ $time -lt 5 ]; do
 		mode=$(get_mode ${modem_no})
 		[ -n "$mode" ] && [ "$mode" != "unknown" ] && break
 		sleep 5s
+		time=$((time+1))
     done
 
+	#获取不到拨号模式
+	[ -z "$mode" ] || [ "$mode" = "unknown" ] && {
+		uci set modem.$1.enable=0
+		uci commit modem
+		return 0
+	}
+
 	#查看该移动网络是否已经有拨号配置在运行
 	mkdir -m 0755 -p "${MODEM_RUNDIR}"
 	if [ ! -f "${MODEM_RUN_CONFIG}" ] || ! grep -q "${network}" "${MODEM_RUN_CONFIG}"; then