fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-08 07:10:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli/devices: on connecting a device, don't uselessly look it up from the ac

Browse source 
For quite some time we already pass the AddAndActivateInfo for device
connect too, and that one remembers the device.
This commit is contained in:
Lubomir Rintel 2019-10-10 15:37:45 +02:00
parent 2ca172ebea
commit 8766d05ea9
1 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
clients/cli/devices.c
View file

@ -1940,9 +1940,8 @@ connect_device_cb (GObject *client, GAsyncResult *result, gpointer user_data)
nm_auto_free_add_and_activate_info AddAndActivateInfo *info = user_data;
NmCli *nmc = info->nmc;
gs_unref_object NMActiveConnection *active = NULL;
NMDevice *device = info->device;
GError *error = NULL;
const GPtrArray *devices;
NMDevice *device;
active = nm_client_activate_connection_finish (NM_CLIENT (client), result, &error);
@ -1964,16 +1963,6 @@ connect_device_cb (GObject *client, GAsyncResult *result, gpointer user_data)
nm_assert (NM_IS_ACTIVE_CONNECTION (active));
devices = nm_active_connection_get_devices (active);
if (devices->len == 0) {
g_string_printf (nmc->return_text, _("Error: Device activation failed: device was disconnected"));
nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION;
quit ();
return;
}
device = g_ptr_array_index (devices, 0);
if (nmc->nowait_flag) {
quit ();
return;