diff options
| author | Michael Biebl <biebl@debian.org> | 2016-04-25 15:06:28 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-04-25 15:06:28 +0200 |
| commit | ba829a4f45f619431fa823c39c19046957958dce (patch) | |
| tree | 450b967a7a247b05b794574fd9859fd987b014b2 /src/devices/nm-device-factory.c | |
| parent | 7cba9af6f00e73f211ec9b6c88474044b421ba14 (diff) | |
| parent | 78c3b8801ecf4975e5da1af3b10ae20dd2d876de (diff) | |
Merge tag 'upstream/1.2.0'
Upstream version 1.2.0
Diffstat (limited to 'src/devices/nm-device-factory.c')
| -rw-r--r-- | src/devices/nm-device-factory.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/devices/nm-device-factory.c b/src/devices/nm-device-factory.c index 9dfa9bcb..482eb185 100644 --- a/src/devices/nm-device-factory.c +++ b/src/devices/nm-device-factory.c @@ -187,10 +187,9 @@ nm_device_factory_get_connection_iface (NMDeviceFactory *factory, klass = NM_DEVICE_FACTORY_GET_INTERFACE (factory); - if (klass->get_connection_iface) + ifname = g_strdup (nm_connection_get_interface_name (connection)); + if (!ifname && klass->get_connection_iface) ifname = klass->get_connection_iface (factory, connection, parent_iface); - else - ifname = g_strdup (nm_connection_get_interface_name (connection)); if (!ifname) { g_set_error (error, |