fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-05 20:30:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: allow devices to activate their generated connections

Browse source 
If the device has a valid generated connection, it's already applied
and the device is already "activated" outside NM, so let activation
happen inside NM regardless of whether the device is available or not
according to NM.
This commit is contained in:
Dan Williams 2013-11-06 22:24:57 -06:00
parent ffea69e06b
commit e7567859c9
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/devices/nm-device.c
View file

@ -4613,8 +4613,6 @@ nm_device_activate (NMDevice *self, NMActRequest *req)
NM_DEVICE_STATE_REASON_NOW_MANAGED);
}
g_assert (nm_device_connection_is_available (self, connection));
priv->act_request = g_object_ref (req);
g_object_notify (G_OBJECT (self), NM_DEVICE_ACTIVE_CONNECTION);

4
src/nm-manager.c
View file

@ -1940,9 +1940,7 @@ add_device (NMManager *self, NMDevice *device, gboolean nm_created)
system_create_virtual_devices (self);
/* If the device has a connection it can assume, do that now */
if ( connection
&& nm_device_is_available (device)
&& nm_device_connection_is_available (device, connection)) {
if (connection) {
NMActiveConnection *active;
NMAuthSubject *subject;
GError *error = NULL;