summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2015-07-02 22:58:12 +0200
committerLubomir Rintel <lkundrak@v3.sk>2015-07-02 23:03:43 +0200
commit1a5fec681be4a3a59c0d37b3a5b0d3e1248095ec (patch)
treedb21099966be454f419dc9481f03806055579f92
parent74818b155c32595ed2882e32f5f42c8072697a28 (diff)
downloadNetworkManager-1a5fec681be4a3a59c0d37b3a5b0d3e1248095ec.tar.gz
infiniband: don't crash if the parent interface is not yet there
Just bail politely just like vlans do.
-rw-r--r--src/devices/nm-device-infiniband.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c
index 020dc53346..2e2483c0cf 100644
--- a/src/devices/nm-device-infiniband.c
+++ b/src/devices/nm-device-infiniband.c
@@ -387,6 +387,9 @@ get_virtual_iface_name (NMDeviceFactory *factory,
s_infiniband = nm_connection_get_setting_infiniband (connection);
g_assert (s_infiniband);
+ if (!parent_iface)
+ return NULL;
+
g_return_val_if_fail (g_strcmp0 (parent_iface, nm_setting_infiniband_get_parent (s_infiniband)) == 0, NULL);
return g_strdup (nm_setting_infiniband_get_virtual_interface_name (s_infiniband));