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

device: pass active-connection's state-change reason to nm_device_disconnect_active_connection()

Browse source 
No change in behavior, yet.
This commit is contained in:
Thomas Haller 2018-11-20 14:25:42 +01:00
parent fe5f5f7a0e
commit 8f36019731
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11826,7 +11826,8 @@ _carrier_wait_check_act_request_must_queue (NMDevice *self, NMActRequest *req)
void
nm_device_disconnect_active_connection (NMActiveConnection *active,
NMDeviceStateReason device_reason)
NMDeviceStateReason device_reason,
NMActiveConnectionStateReason active_reason)
{
NMDevice *self;
NMDevicePrivate *priv;
@ -11838,7 +11839,7 @@ nm_device_disconnect_active_connection (NMActiveConnection *active,
if (!self) {
/* hm, no device? Just fail the active connection. */
nm_active_connection_set_state_fail (active,
NM_ACTIVE_CONNECTION_STATE_REASON_UNKNOWN,
active_reason,
NULL);
return;
}

3
src/devices/nm-device.h
View file

@ -770,7 +770,8 @@ void nm_device_queue_state (NMDevice *self,
gboolean nm_device_get_firmware_missing (NMDevice *self);
void nm_device_disconnect_active_connection (NMActiveConnection *active,
NMDeviceStateReason device_reason);
NMDeviceStateReason device_reason,
NMActiveConnectionStateReason active_reason);
void nm_device_queue_activation (NMDevice *device, NMActRequest *req);

3
src/nm-manager.c
View file

@ -4550,7 +4550,8 @@ _internal_activate_device (NMManager *self, NMActiveConnection *active, GError *
nm_device_disconnect_active_connection ( all_ac_arr
? all_ac_arr->pdata[i]
: ac,
NM_DEVICE_STATE_REASON_NEW_ACTIVATION);
NM_DEVICE_STATE_REASON_NEW_ACTIVATION,
NM_ACTIVE_CONNECTION_STATE_REASON_UNKNOWN);
}
}
}