summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2014-10-09 16:01:48 -0500
committerDan Williams <dcbw@redhat.com>2014-12-11 10:04:35 -0600
commitc8871ee6f7add3699c1b39e85d7f43e70b031f9b (patch)
tree2b0da3ce8cc92d5165726c3ffd68298379df7be7
parent4e23e607970f1920e94f46c10cd14eac978d19ce (diff)
downloadNetworkManager-c8871ee6f7add3699c1b39e85d7f43e70b031f9b.tar.gz
fixup! core: split device creation and device setup
-rw-r--r--src/devices/wifi/nm-wifi-factory.c4
-rw-r--r--src/devices/wimax/nm-wimax-factory.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/wifi/nm-wifi-factory.c b/src/devices/wifi/nm-wifi-factory.c
index 4d5e6cebff..35073b155a 100644
--- a/src/devices/wifi/nm-wifi-factory.c
+++ b/src/devices/wifi/nm-wifi-factory.c
@@ -67,9 +67,9 @@ create_device (NMDeviceFactory *factory,
g_return_val_if_fail (plink != NULL, NULL);
if (plink->type == NM_LINK_TYPE_WIFI)
- return nm_device_wifi_new (plink->name);
+ return nm_device_wifi_new (iface);
else if (plink->type == NM_LINK_TYPE_OLPC_MESH)
- return nm_device_olpc_mesh_new (plink->name);
+ return nm_device_olpc_mesh_new (iface);
return NULL;
}
diff --git a/src/devices/wimax/nm-wimax-factory.c b/src/devices/wimax/nm-wimax-factory.c
index b290072ed1..73ad40af3d 100644
--- a/src/devices/wimax/nm-wimax-factory.c
+++ b/src/devices/wimax/nm-wimax-factory.c
@@ -69,7 +69,7 @@ create_device (NMDeviceFactory *factory,
if (g_strcmp0 (plink->driver, "i2400m_usb") != 0)
return NULL; /* unsupported */
- return (NMDevice *) nm_device_wimax_new (plink->name);
+ return (NMDevice *) nm_device_wimax_new (iface);
}
NM_DEVICE_FACTORY_DECLARE_TYPES (