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
This commit is contained in:
John Crispin 2015-03-09 14:06:50 +00:00
parent 3f0f0b8ece
commit 6ab19b7f46

View file

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