From c4bd0cc5cb87801691122c340c7ec0c3f7190ac4 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 15 Jan 2016 12:07:00 +0100 Subject: [PATCH] device: always process hop limit and MTU from the RA Apply MTU and hop limit when managed or other flag is set as well. This wasn't the case for the first RA and the previous commit made it slightly worse by always ignoring it. Fixes: ad2584c375e21e262ef0c40880a7374e7372c746 --- src/devices/nm-device.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 72b148474a..231ab00672 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -5500,13 +5500,11 @@ rdisc_config_changed (NMRDisc *rdisc, NMRDiscConfigMap changed, NMDevice *self) } } - if (priv->dhcp6_mode == NM_RDISC_DHCP_LEVEL_NONE) { - if (changed & NM_RDISC_CONFIG_HOP_LIMIT) - nm_platform_sysctl_set_ip6_hop_limit_safe (NM_PLATFORM_GET, nm_device_get_ip_iface (self), rdisc->hop_limit); + if (changed & NM_RDISC_CONFIG_HOP_LIMIT) + nm_platform_sysctl_set_ip6_hop_limit_safe (NM_PLATFORM_GET, nm_device_get_ip_iface (self), rdisc->hop_limit); - if (changed & NM_RDISC_CONFIG_MTU) - priv->ip6_mtu = rdisc->mtu; - } + if (changed & NM_RDISC_CONFIG_MTU) + priv->ip6_mtu = rdisc->mtu; nm_device_activate_schedule_ip6_config_result (self); }