Merge tag 'upstream/1.5.90' into experimental

Upstream version 1.5.90

1 files changed, 5 insertions, 3 deletions

diff --git a/src/devices/nm-device-vxlan.h b/src/devices/nm-device-vxlan.h
index 71204d3b..6f0102dc 100644
--- a/src/devices/nm-device-vxlan.h
+++ b/src/devices/nm-device-vxlan.h
@@ -30,7 +30,6 @@
 #define NM_IS_DEVICE_VXLAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  NM_TYPE_DEVICE_VXLAN))
 #define NM_DEVICE_VXLAN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  NM_TYPE_DEVICE_VXLAN, NMDeviceVxlanClass))
 
-#define NM_DEVICE_VXLAN_PARENT       "parent"
 #define NM_DEVICE_VXLAN_ID           "id"
 #define NM_DEVICE_VXLAN_GROUP        "group"
 #define NM_DEVICE_VXLAN_LOCAL        "local"
@@ -47,8 +46,11 @@
 #define NM_DEVICE_VXLAN_L2MISS       "l2miss"
 #define NM_DEVICE_VXLAN_L3MISS       "l3miss"
 
-typedef NMDevice NMDeviceVxlan;
-typedef NMDeviceClass NMDeviceVxlanClass;
+/* defined in the parent class, but exposed on D-Bus by the subclass. */
+#define NM_DEVICE_VXLAN_PARENT       NM_DEVICE_PARENT
+
+typedef struct _NMDeviceVxlan NMDeviceVxlan;
+typedef struct _NMDeviceVxlanClass NMDeviceVxlanClass;
 
 GType nm_device_vxlan_get_type (void);