colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2007-09-25 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/nm-device.c
		- (device_activation_go): small hack to work around race when
			activating deferred connections; should solve this in a better way



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2886 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2007-09-25 19:35:26 +00:00
parent 55eab8b023
commit 9c2848d56a
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2007-09-25 Dan Williams <dcbw@redhat.com>
* src/nm-device.c
- (device_activation_go): small hack to work around race when
activating deferred connections; should solve this in a better way
2007-09-25 Dan Williams <dcbw@redhat.com> 2007-09-25 Dan Williams <dcbw@redhat.com>
* introspection/nm-device.xml * introspection/nm-device.xml

7
src/nm-device.c
View File

@@ -1167,6 +1167,13 @@ device_activation_go (NMDevice *self)
self); self);
priv->secrets_updated_id = id; priv->secrets_updated_id = id;
/* HACK: update the state a bit early to avoid a race between the
* scheduled stage1 handler and nm_policy_device_change_check() thinking
* that the activation request isn't deferred because the deferred bit
* gets cleared a bit too early, when the connection becomes valid.
*/
nm_device_state_changed (self, NM_DEVICE_STATE_PREPARE);
nm_device_activate_schedule_stage1_device_prepare (self); nm_device_activate_schedule_stage1_device_prepare (self);
} }