Merge tag 'upstream/1.1.90' into experimental

Upstream version 1.1.90

1 files changed, 4 insertions, 5 deletions

diff --git a/src/devices/nm-device-macvlan.h b/src/devices/nm-device-macvlan.h
index 24f15437..89f670bd 100644
--- a/src/devices/nm-device-macvlan.h
+++ b/src/devices/nm-device-macvlan.h
@@ -21,9 +21,7 @@
 #ifndef __NETWORKMANAGER_DEVICE_MACVLAN_H__
 #define __NETWORKMANAGER_DEVICE_MACVLAN_H__
 
-#include <glib-object.h>
-
-#include "nm-device-generic.h"
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 
@@ -37,9 +35,10 @@ G_BEGIN_DECLS
 #define NM_DEVICE_MACVLAN_PARENT     "parent"
 #define NM_DEVICE_MACVLAN_MODE       "mode"
 #define NM_DEVICE_MACVLAN_NO_PROMISC "no-promisc"
+#define NM_DEVICE_MACVLAN_TAP        "tap"
 
-typedef NMDeviceGeneric NMDeviceMacvlan;
-typedef NMDeviceGenericClass NMDeviceMacvlanClass;
+typedef NMDevice NMDeviceMacvlan;
+typedef NMDeviceClass NMDeviceMacvlanClass;
 
 GType nm_device_macvlan_get_type (void);