From 2c032d8f1c6292c1338a615e6ec40252889ba85c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 22 Jan 2015 00:29:39 +0100 Subject: Imported Upstream version 1.0.0 --- src/devices/nm-device-vlan.h | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'src/devices/nm-device-vlan.h') diff --git a/src/devices/nm-device-vlan.h b/src/devices/nm-device-vlan.h index 0f2ac70d..20fc3453 100644 --- a/src/devices/nm-device-vlan.h +++ b/src/devices/nm-device-vlan.h @@ -18,8 +18,8 @@ * Copyright 2012 Red Hat, Inc. */ -#ifndef NM_DEVICE_VLAN_H -#define NM_DEVICE_VLAN_H +#ifndef __NETWORKMANAGER_DEVICE_VLAN_H__ +#define __NETWORKMANAGER_DEVICE_VLAN_H__ #include @@ -40,26 +40,18 @@ typedef enum { NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/ } NMVlanError; +/* D-Bus exported properties */ #define NM_DEVICE_VLAN_PARENT "parent" #define NM_DEVICE_VLAN_ID "vlan-id" -typedef struct { - NMDevice parent; -} NMDeviceVlan; - -typedef struct { - NMDeviceClass parent; - -} NMDeviceVlanClass; +/* Internal non-exported properties */ +#define NM_DEVICE_VLAN_INT_PARENT_DEVICE "int-parent-device" +typedef NMDevice NMDeviceVlan; +typedef NMDeviceClass NMDeviceVlanClass; GType nm_device_vlan_get_type (void); -NMDevice *nm_device_vlan_new (NMPlatformLink *platform_link, - NMDevice *parent); -NMDevice *nm_device_vlan_new_for_connection (NMConnection *connection, - NMDevice *parent); - G_END_DECLS #endif /* NM_DEVICE_VLAN_H */ -- cgit 1.3.0-6-gf8a5