summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2014-10-22 14:44:24 +0200
committerDan Williams <dcbw@redhat.com>2014-12-11 09:38:44 -0600
commit6a9775342829f92dc071903776a977357cccbe0f (patch)
treecc6ab3b31a5170b781111742dbeb3e6fea4b818f
parente5745c5d60e05171f2ac799b9eebe27182052ff7 (diff)
downloadNetworkManager-6a9775342829f92dc071903776a977357cccbe0f.tar.gz
fixup! core: move virtual interface name handling into device plugins
(allow-none) for the out arguments
-rw-r--r--src/devices/nm-device-factory.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/devices/nm-device-factory.c b/src/devices/nm-device-factory.c
index b86d42089e..207e80141c 100644
--- a/src/devices/nm-device-factory.c
+++ b/src/devices/nm-device-factory.c
@@ -53,8 +53,16 @@ nm_device_factory_get_supported_types (NMDeviceFactory *factory,
const NMLinkType **out_link_types,
const char ***out_setting_types)
{
+ const NMLinkType *link_types_fallback;
+ const char **setting_types_fallback;
+
g_return_if_fail (factory != NULL);
+ if (!out_link_types)
+ out_link_types = &link_types_fallback;
+ if (!out_setting_types)
+ out_setting_types = &setting_types_fallback;
+
NM_DEVICE_FACTORY_GET_INTERFACE (factory)->get_supported_types (factory,
out_link_types,
out_setting_types);