From 3d898d1b66eeecc550abf1d83fefc0dff6dcf0bd Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 7 Sep 2011 17:20:42 -0500 Subject: [PATCH] wimax: fix connect-during-scan after d4ff43bc1eaf0e0548c778fdd5fa86e1b9cf3b76 Oops; mark prepare_done during stage1 not stage2 since stage1 is Prepare and stage2 isn't. --- src/wimax/nm-device-wimax.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/wimax/nm-device-wimax.c b/src/wimax/nm-device-wimax.c index 1e8331f5f8..d41491a5d6 100644 --- a/src/wimax/nm-device-wimax.c +++ b/src/wimax/nm-device-wimax.c @@ -750,6 +750,8 @@ real_act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason) set_current_nsp (NM_DEVICE_WIMAX (device), nsp); + priv->prepare_done = TRUE; + /* If the device is scanning, it won't connect, so we have to wait until * it's not scanning to proceed to stage 2. */ @@ -795,7 +797,6 @@ real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason) /* FIXME: Is 40 seconds good estimation? I have no idea */ priv->activation_timeout_id = g_timeout_add_seconds (40, activation_timed_out, device); - priv->prepare_done = TRUE; return NM_ACT_STAGE_RETURN_POSTPONE; }