diff mbox series

[LEDE-DEV,3/9] net: uqmi: fix blocking in endless loops when unplugging device

Message ID 1518704164-22198-4-git-send-email-koen.vandeputte@ncentric.com
State Accepted
Delegated to: John Crispin
Headers show
Series uqmi: Add raw-ip mode support for 17.01 branch | expand

Commit Message

Koen Vandeputte Feb. 15, 2018, 2:15 p.m. UTC 
From: Alexandru Ardelean <ardeleanalex@gmail.com>

If you unplug a QMI device, the /dev/cdc-wdmX device
disappears but uqmi will continue to poll it endlessly.

Then, when you plug it back, you have 2 uqmi processes,
and that's bad, because 2 processes talking QMI to the
same device [and the same time] doesn't seem to work well.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
---
 package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh | 2 ++
 1 file changed, 2 insertions(+)
diff mbox series

Patch

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 6f11933a9e51..9c953ea69757 100755
--- a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
+++ b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
@@ -65,6 +65,7 @@  proto_qmi_setup() {
 	[ -n "$delay" ] && sleep "$delay"
 
 	while uqmi -s -d "$device" --get-pin-status | grep '"UIM uninitialized"' > /dev/null; do
+		[ -e "$device" ] || return 1
 		sleep 1;
 	done
 
@@ -102,6 +103,7 @@  proto_qmi_setup() {
 
 	echo "Waiting for network registration"
 	while uqmi -s -d "$device" --get-serving-system | grep '"searching"' > /dev/null; do
+		[ -e "$device" ] || return 1
 		sleep 5;
 	done