From 41b3c4569933a3b8a3b00a8e4c01fbc5863d7ce3 Mon Sep 17 00:00:00 2001 From: Andrew Zaborowski Date: Sun, 16 Sep 2018 17:23:49 +0200 Subject: [PATCH] wifi/iwd: don't change state in secrets callback Also make sure the secrets request callback only send a reply to IWD and the Connect method return callback executes the device state change to "disconnected". (cherry picked from commit 061913c58812727062eeb282a3e1d7c37289a642) --- src/devices/wifi/nm-device-iwd.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/devices/wifi/nm-device-iwd.c b/src/devices/wifi/nm-device-iwd.c index ef5ad020b6..3bdb1e3dca 100644 --- a/src/devices/wifi/nm-device-iwd.c +++ b/src/devices/wifi/nm-device-iwd.c @@ -1248,12 +1248,7 @@ secrets_error: g_dbus_method_invocation_return_error_literal (invocation, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INVALID_CONNECTION, "NM secrets request failed"); - - nm_device_state_changed (device, - NM_DEVICE_STATE_FAILED, - NM_DEVICE_STATE_REASON_NO_SECRETS); - - cleanup_association_attempt (self, TRUE); + /* Now wait for the Connect callback to update device state */ } static void