diff options
| author | Michael Biebl <biebl@debian.org> | 2017-12-12 15:53:47 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-12-12 15:53:47 +0100 |
| commit | 743faa81fda27a9c03298e8d6074623dc30db606 (patch) | |
| tree | 28418e92b22530bb05f043084626291ed1e3d46b /src/devices/nm-device-vlan.c | |
| parent | 8dda18a856c2a05cefcab6278469c9d8df30f935 (diff) | |
| parent | afcd268ea7b1149fbfb66bce4eca659b675da0a2 (diff) | |
Update upstream source from tag 'upstream/1.10.2'
Update to upstream version '1.10.2' with Debian dir 41691ea145b392588cd4e9e7496b61d5a95965fb
Diffstat (limited to 'src/devices/nm-device-vlan.c')
| -rw-r--r-- | src/devices/nm-device-vlan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c index e30dae74..81512335 100644 --- a/src/devices/nm-device-vlan.c +++ b/src/devices/nm-device-vlan.c @@ -66,7 +66,7 @@ struct _NMDeviceVlanClass { G_DEFINE_TYPE (NMDeviceVlan, nm_device_vlan, NM_TYPE_DEVICE) -#define NM_DEVICE_VLAN_GET_PRIVATE(self) _NM_GET_PRIVATE (self, NMDeviceVlan, NM_IS_DEVICE_VLAN) +#define NM_DEVICE_VLAN_GET_PRIVATE(self) _NM_GET_PRIVATE (self, NMDeviceVlan, NM_IS_DEVICE_VLAN, NMDevice) /*****************************************************************************/ @@ -418,7 +418,7 @@ complete_connection (NMDevice *device, static void update_connection (NMDevice *device, NMConnection *connection) { - NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE ((NMDeviceVlan *) device); + NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (device); NMSettingVlan *s_vlan = nm_connection_get_setting_vlan (connection); int ifindex = nm_device_get_ifindex (device); const char *setting_parent, *new_parent; @@ -558,7 +558,7 @@ static void get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE ((NMDeviceVlan *) object); + NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (object); switch (prop_id) { case PROP_VLAN_ID: |