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

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

Browse Source 
* src/NetworkManagerPolicy.c
		- (nm_policy_auto_get_best_device): don't interrupt activation of a
			device by deactivating it because it doesn't have a "best connection".
			Since autoconnect=False connections aren't automatically chosen,
			NM would interrupt activation of such a connection because it
			would never be "best" due to autoconnect=False.



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2867 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2007-09-24 21:50:11 +00:00
parent 44b7179e8c
commit 490117633c
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2007-09-24 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerPolicy.c
- (nm_policy_auto_get_best_device): don't interrupt activation of a
device by deactivating it because it doesn't have a "best connection".
Since autoconnect=False connections aren't automatically chosen,
NM would interrupt activation of such a connection because it
would never be "best" due to autoconnect=False.
2007-09-24 Dan Williams <dcbw@redhat.com> 2007-09-24 Dan Williams <dcbw@redhat.com>
* src/nm-manager.c * src/nm-manager.c

19
src/NetworkManagerPolicy.c
View File

@@ -99,8 +99,18 @@ nm_policy_auto_get_best_device (NMPolicy *policy,
caps = nm_device_get_capabilities (dev); caps = nm_device_get_capabilities (dev);
tmp_con = nm_device_get_best_connection (dev, &tmp_obj); tmp_con = nm_device_get_best_connection (dev, &tmp_obj);
if (tmp_con == NULL) if (tmp_con == NULL) {
continue; NMActRequest *req = nm_device_get_act_request (dev);
/* If the device is activating, the NMConnection it's got is the
* best one. In other words, follow activation of a particular
* NMConnection through to success/failure rather than cutting it
* off if it becomes invalid
*/
tmp_con = req ? nm_act_request_get_connection (req) : NULL;
if (!tmp_con)
continue;
}
if (NM_IS_DEVICE_802_3_ETHERNET (dev)) { if (NM_IS_DEVICE_802_3_ETHERNET (dev)) {
if (link_active) if (link_active)
@@ -115,9 +125,8 @@ nm_policy_auto_get_best_device (NMPolicy *policy,
best_wired_connection = tmp_con; best_wired_connection = tmp_con;
best_wired_specific_object = tmp_obj; best_wired_specific_object = tmp_obj;
} }
} } else if ( NM_IS_DEVICE_802_11_WIRELESS (dev)
else if (NM_IS_DEVICE_802_11_WIRELESS (dev) && && nm_manager_wireless_enabled (policy->manager)) {
nm_manager_wireless_enabled (policy->manager)) {
/* Bump by 1 so that _something_ gets chosen every time */ /* Bump by 1 so that _something_ gets chosen every time */
prio += 1; prio += 1;