diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2021-02-25 11:35:01 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2021-02-25 11:49:48 +0100 |
| commit | 77dea84aa6e816f66dc622cec8ae2668eba3c068 (patch) | |
| tree | 755536a0ed1fb36c2899e9bff9e092c4008a25c4 /libnm/nm-device-ovs-interface.c | |
| parent | 47f08826b44eed651b44dc8bacb5b46bc4c52067 (diff) | |
| parent | fd80297a396cc4dd7da4da20208fb360aa369aa7 (diff) | |
Merge branch 'debian/master' into ubuntu/master
Diffstat (limited to 'libnm/nm-device-ovs-interface.c')
| -rw-r--r-- | libnm/nm-device-ovs-interface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libnm/nm-device-ovs-interface.c b/libnm/nm-device-ovs-interface.c index 7ed55c79..1c757a5b 100644 --- a/libnm/nm-device-ovs-interface.c +++ b/libnm/nm-device-ovs-interface.c @@ -1,9 +1,9 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* * Copyright (C) 2017 Red Hat, Inc. */ -#include "nm-default.h" +#include "libnm/nm-default-libnm.h" #include "nm-device-ovs-interface.h" @@ -76,7 +76,7 @@ nm_device_ovs_interface_init(NMDeviceOvsInterface *device) const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_ovsinterface = NML_DBUS_META_IFACE_INIT(NM_DBUS_INTERFACE_DEVICE_OVS_INTERFACE, nm_device_ovs_interface_get_type, - NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH, ); + NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30, ); static void nm_device_ovs_interface_class_init(NMDeviceOvsInterfaceClass *ovs_interface_class) |