From 494f296a3baab08522617b24b1f126d8f9a17502 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 20 Jan 2016 16:26:51 +0100 Subject: Imported Upstream version 1.1.90 --- src/devices/nm-device-macvlan.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/devices/nm-device-macvlan.h') 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 - -#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); -- cgit 1.3.0-6-gf8a5