From 429393567647935d9123e21fd27a7529d50255eb Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 1 Jul 2018 20:58:23 +0200 Subject: New upstream version 1.12.0 --- src/devices/nm-device-vlan.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/devices/nm-device-vlan.c') diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c index a7f4c4bc..b0e746a8 100644 --- a/src/devices/nm-device-vlan.c +++ b/src/devices/nm-device-vlan.c @@ -534,19 +534,21 @@ act_stage1_prepare (NMDevice *device, NMDeviceStateReason *out_failure_reason) } static guint32 -get_configured_mtu (NMDevice *self, gboolean *out_is_user_config) +get_configured_mtu (NMDevice *self, NMDeviceMtuSource *out_source) { guint32 mtu = 0; int ifindex; - mtu = nm_device_get_configured_mtu_for_wired (self, out_is_user_config); - if (*out_is_user_config) + mtu = nm_device_get_configured_mtu_for_wired (self, out_source); + if (*out_source != NM_DEVICE_MTU_SOURCE_NONE) return mtu; /* Inherit the MTU from parent device, if any */ ifindex = nm_device_parent_get_ifindex (self); - if (ifindex > 0) + if (ifindex > 0) { mtu = nm_platform_link_get_mtu (nm_device_get_platform (NM_DEVICE (self)), ifindex); + *out_source = NM_DEVICE_MTU_SOURCE_PARENT; + } return mtu; } -- cgit 1.3.0-6-gf8a5