summaryrefslogtreecommitdiff
path: root/gsupplicant
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2010-12-23 12:57:16 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2010-12-23 12:57:16 +0100
commit11afa5b184a606804edfc66bad98146e792a8746 (patch)
treee58e41db8f46d10f8d32c0cffcc4c6914f23edd4 /gsupplicant
parent1f2b252d8809547a608187130af5f943882d87f2 (diff)
downloadconnman-11afa5b184a606804edfc66bad98146e792a8746.tar.gz
connman-11afa5b184a606804edfc66bad98146e792a8746.tar.bz2
connman-11afa5b184a606804edfc66bad98146e792a8746.zip
gsupplicant: Remove network even if disconnect failed
If a connection is in progress but is cancelled before wpa supplicant reached the ASSOCIATING phase, removing the network is the only way to prevent it from continuing the association.
Diffstat (limited to 'gsupplicant')
-rw-r--r--gsupplicant/supplicant.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c
index 8d2c15fb..42f49203 100644
--- a/gsupplicant/supplicant.c
+++ b/gsupplicant/supplicant.c
@@ -2472,10 +2472,8 @@ static void interface_disconnect_result(const char *error,
SUPPLICANT_DBG("");
- if (error != NULL && data->callback != NULL) {
+ if (error != NULL && data->callback != NULL)
data->callback(-EIO, data->interface, data->user_data);
- return;
- }
network_remove(data);
}