From e3ba9162c2ede4ab2cc6eb42021909bc11722562 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sat, 11 Dec 2010 12:33:15 -0600 Subject: [PATCH] supplicant: fix state handling after READY has been reached We only want to prevent regression to > READY after READY has been reached, since the interface state will track the supplicant connection state which legitimately jumps around. --- src/supplicant-manager/nm-supplicant-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c index 11064a1904..93807b9360 100644 --- a/src/supplicant-manager/nm-supplicant-interface.c +++ b/src/supplicant-manager/nm-supplicant-interface.c @@ -289,7 +289,7 @@ set_state (NMSupplicantInterface *self, guint32 new_state) /* Cannot regress to READY, STARTING, or INIT from higher states */ if (priv->state >= NM_SUPPLICANT_INTERFACE_STATE_READY) - g_return_if_fail (new_state > priv->state); + g_return_if_fail (new_state > NM_SUPPLICANT_INTERFACE_STATE_READY); if (new_state == NM_SUPPLICANT_INTERFACE_STATE_DOWN) { /* Cancel all pending calls when going down */