From 1e012fd697d87a2ace9e0c2e046a206b377dc18c Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Thu, 12 Apr 2018 13:20:49 +0200 Subject: [PATCH] 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 (backported from dec1bfa0f48d43174921d1a1357a4842f9ba0cf6) --- .../network/utils/uqmi/files/lib/netifd/proto/qmi.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 560c0b9459..f1a939763a 100755 --- a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh +++ b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh @@ -125,9 +125,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 -- 2.30.2