diff options
| author | Michael Biebl <biebl@debian.org> | 2017-05-11 15:03:26 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-05-11 15:03:26 +0200 |
| commit | 04996460fa839109b6318838d1f41e5f3ef8139a (patch) | |
| tree | cb35e54363b8ea8e78e6978a92fb68ae9409e116 /src/devices/nm-device-generic.c | |
| parent | 1ae6f6dc1b3c266401a4709995991b967320139a (diff) | |
| parent | c333f062ddcba9b35330647bf6cbd0a07f2d786e (diff) | |
Merge tag 'upstream/1.8.0' into experimental
Upstream version 1.8.0
Diffstat (limited to 'src/devices/nm-device-generic.c')
| -rw-r--r-- | src/devices/nm-device-generic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/devices/nm-device-generic.c b/src/devices/nm-device-generic.c index 2f51c69d..f6a670b2 100644 --- a/src/devices/nm-device-generic.c +++ b/src/devices/nm-device-generic.c @@ -54,11 +54,11 @@ G_DEFINE_TYPE (NMDeviceGeneric, nm_device_generic, NM_TYPE_DEVICE) /*****************************************************************************/ static NMDeviceCapabilities -get_generic_capabilities (NMDevice *dev) +get_generic_capabilities (NMDevice *device) { - int ifindex = nm_device_get_ifindex (dev); + int ifindex = nm_device_get_ifindex (device); - if (ifindex > 0 && nm_platform_link_supports_carrier_detect (NM_PLATFORM_GET, ifindex)) + if (ifindex > 0 && nm_platform_link_supports_carrier_detect (nm_device_get_platform (device), ifindex)) return NM_DEVICE_CAP_CARRIER_DETECT; else return NM_DEVICE_CAP_NONE; @@ -84,7 +84,7 @@ realize_start_notify (NMDevice *device, const NMPlatformLink *plink) g_clear_pointer (&priv->type_description, g_free); ifindex = nm_device_get_ip_ifindex (NM_DEVICE (self)); if (ifindex > 0) - priv->type_description = g_strdup (nm_platform_link_get_type_name (NM_PLATFORM_GET, ifindex)); + priv->type_description = g_strdup (nm_platform_link_get_type_name (nm_device_get_platform (device), ifindex)); } static gboolean |