From: John Crispin <john@openwrt.org>
Date: Mon, 9 Mar 2015 14:06:50 +0000 (+0000)
Subject: ncm: Remove unnecessary proto_set_available commands
X-Git-Tag: reboot~4100
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6ab19b7f467e8303df8591d53d2294344eb4cf48;p=oweals%2Fopenwrt.git

ncm: Remove unnecessary proto_set_available commands

Interface should not be set unavailable in all error cases,
returning 1 is enough.

Signed-off-by: Matti Laakso <malaakso@elisanet.fi>

SVN-Revision: 44630
---

diff --git a/package/network/utils/comgt/files/ncm.sh b/package/network/utils/comgt/files/ncm.sh
index 2c2835fe39..4c3f161f98 100644
--- a/package/network/utils/comgt/files/ncm.sh
+++ b/package/network/utils/comgt/files/ncm.sh
@@ -41,7 +41,6 @@ proto_ncm_setup() {
 	[ -n "$apn" ] || {
 		echo "No APN specified"
 		proto_notify_error "$interface" NO_APN
-		proto_set_available "$interface" 0
 		return 1
 	}
 
@@ -69,7 +68,6 @@ proto_ncm_setup() {
 	[ $? -ne 0 ] && {
 		echo "Failed to get modem information"
 		proto_notify_error "$interface" GETINFO_FAILED
-		proto_set_available "$interface" 0
 		return 1
 	}
 
@@ -86,7 +84,6 @@ proto_ncm_setup() {
 		eval COMMAND="$i" gcom -d "$device" -s /etc/gcom/runcommand.gcom || {
 			echo "Failed to initialize modem"
 			proto_notify_error "$interface" INITIALIZE_FAILED
-			proto_set_available "$interface" 0
 			return 1
 		}
 	done
@@ -105,7 +102,6 @@ proto_ncm_setup() {
 		COMMAND="$setmode" gcom -d "$device" -s /etc/gcom/runcommand.gcom || {
 			echo "Failed to set operating mode"
 			proto_notify_error "$interface" SETMODE_FAILED
-			proto_set_available "$interface" 0
 			return 1
 		}
 		json_select ..
@@ -115,7 +111,6 @@ proto_ncm_setup() {
 	eval COMMAND="$connect" gcom -d "$device" -s /etc/gcom/runcommand.gcom || {
 		echo "Failed to connect"
 		proto_notify_error "$interface" CONNECT_FAILED
-		proto_set_available "$interface" 0
 		return 1
 	}