fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 12:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

wimax: fix connect-during-scan after d4ff43bc1e

Browse source 
Oops; mark prepare_done during stage1 not stage2 since stage1 is Prepare
and stage2 isn't.
This commit is contained in:
Dan Williams 2011-09-07 17:20:42 -05:00
parent d4ff43bc1e
commit 3d898d1b66
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/wimax/nm-device-wimax.c
View file

@ -750,6 +750,8 @@ real_act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason)
set_current_nsp (NM_DEVICE_WIMAX (device), nsp); 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 /* If the device is scanning, it won't connect, so we have to wait until
* it's not scanning to proceed to stage 2. * 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 */ /* FIXME: Is 40 seconds good estimation? I have no idea */
priv->activation_timeout_id = g_timeout_add_seconds (40, activation_timed_out, device); priv->activation_timeout_id = g_timeout_add_seconds (40, activation_timed_out, device);
priv->prepare_done = TRUE;
return NM_ACT_STAGE_RETURN_POSTPONE; return NM_ACT_STAGE_RETURN_POSTPONE;
} }