From: Florian Eckert <fe@dev.tdt.de>
Date: Thu, 12 Apr 2018 11:20:49 +0000 (+0200)
Subject: uqmi: do not block proto handler if modem is unable to registrate
X-Git-Tag: v19.07.0-rc1~2345
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=dec1bfa0f48d43174921d1a1357a4842f9ba0cf6;p=openwrt%2Fopenwrt.git

uqmi: do not block proto handler if modem is unable to registrate

QMI proto setup-handler will wait forever if it is unable to registrate to
the mobile network. To fix this stop polling network registration status
and notify netifd. Netifd will generate then a "ifup-failed" ACTION.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---

diff --git a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
index a0dcb17cde..f3c5487574 100755
--- a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
+++ b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
@@ -123,9 +123,18 @@ proto_qmi_setup() {
 	uqmi -s -d "$device" --sync > /dev/null 2>&1
 
 	echo "Waiting for network registration"
+	local registration_timeout=0
 	while uqmi -s -d "$device" --get-serving-system | grep '"searching"' > /dev/null; do
 		[ -e "$device" ] || return 1
-		sleep 5;
+		if [ "$registration_timeout" -lt "$timeout" ]; then
+			let registration_timeout++
+			sleep 1;
+		else
+			echo "Network registration failed"
+			proto_notify_error "$interface" NETWORK_REGISTRATION_FAILED
+			proto_block_restart "$interface"
+			return 1
+		fi
 	done
 
 	[ -n "$modes" ] && uqmi -s -d "$device" --set-network-modes "$modes" > /dev/null 2>&1