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

Implement PPPoE.

Browse Source 
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3418 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Tambet Ingo
2008-03-11 16:37:41 +00:00
parent d03bed314f
commit cc2675ebb1
12 changed files with 632 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/NetworkManagerPolicy.c
View File

@@ -163,6 +163,14 @@ auto_activate_device (gpointer user_data)
GSList *connections, *iter;
g_assert (data);
// FIXME: if a device is already activating (or activated) with a connection
// but another connection now overrides the current one for that device,
// deactivate the device and activate the new connection instead of just
// bailing if the device is already active
if (nm_device_get_act_request (data->device))
return FALSE;
policy = data->policy;
/* System connections first, then user connections */
@@ -238,13 +246,6 @@ schedule_activate_check (NMPolicy *policy, NMDevice *device)
if (!nm_device_can_activate (device, wireless_enabled))
return;
// FIXME: if a device is already activating (or activated) with a connection
// but another connection now overrides the current one for that device,
// deactivate the device and activate the new connection instead of just
// bailing if the device is already active
if (nm_device_get_act_request (device))
return;
for (iter = policy->pending_activation_checks; iter; iter = g_slist_next (iter)) {
/* Only one pending activation check at a time */
if (((ActivateData *) iter->data)->device == device)