diff options
author | Thomas Haller <thaller@redhat.com> | 2019-09-23 12:49:20 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2019-09-23 12:49:20 +0200 |
commit | e79f1b623d4154631f66d8bc6cca151a1d840b4e (patch) | |
tree | 5fd7a28f36359ad9c659aa04adeac15a86559b5c /src/devices/ovs | |
parent | d19a403faa480b20f9ca6c9ce9e66a015b16cf46 (diff) | |
parent | 4154d9618c904c2286b332b56f3515806cb1bb3b (diff) | |
download | NetworkManager-e79f1b623d4154631f66d8bc6cca151a1d840b4e.tar.gz |
bluez: merge branch 'th/bluez-rework-2'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/251
Diffstat (limited to 'src/devices/ovs')
-rw-r--r-- | src/devices/ovs/nm-ovs-factory.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/ovs/nm-ovs-factory.c b/src/devices/ovs/nm-ovs-factory.c index 88e3b8be2d..0280ec4220 100644 --- a/src/devices/ovs/nm-ovs-factory.c +++ b/src/devices/ovs/nm-ovs-factory.c @@ -70,7 +70,7 @@ new_device_from_type (const char *name, NMDeviceType device_type) const char *type_desc; NMLinkType link_type = NM_LINK_TYPE_NONE; - if (nm_manager_get_device (nm_manager_get (), name, device_type)) + if (nm_manager_get_device (NM_MANAGER_GET, name, device_type)) return NULL; if (device_type == NM_DEVICE_TYPE_OVS_INTERFACE) { @@ -117,7 +117,7 @@ ovsdb_device_removed (NMOvsdb *ovsdb, const char *name, NMDeviceType device_type NMDevice *device; NMDeviceState device_state; - device = nm_manager_get_device (nm_manager_get (), name, device_type); + device = nm_manager_get_device (NM_MANAGER_GET, name, device_type); if (!device) return; @@ -145,7 +145,7 @@ ovsdb_interface_failed (NMOvsdb *ovsdb, _LOGI (name, connection_uuid, "ovs interface \"%s\" (%s) failed: %s", name, connection_uuid, error); - device = nm_manager_get_device (nm_manager_get (), name, NM_DEVICE_TYPE_OVS_INTERFACE); + device = nm_manager_get_device (NM_MANAGER_GET, name, NM_DEVICE_TYPE_OVS_INTERFACE); if (!device) return; |