From 78c3b8801ecf4975e5da1af3b10ae20dd2d876de Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 20 Apr 2016 21:11:10 +0200 Subject: Imported Upstream version 1.2.0 --- src/devices/nm-device-factory.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/devices/nm-device-factory.c') 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, -- cgit 1.3.0-6-gf8a5