summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2017-01-24 16:28:04 +0100
committerThomas Haller <thaller@redhat.com>2017-01-24 16:36:56 +0100
commitec66135a40efa2326494af6e99f203654a302a69 (patch)
tree7885f04cc8665fc98b1f3f15d4451df92f735226
parentc8a649b3ded70f63e5f3f7f3f75282d4cd8b0590 (diff)
downloadNetworkManager-ec66135a40efa2326494af6e99f203654a302a69.tar.gz
device: fix setting minimal MTU to 1280 for IPv6
Fixes: 665e3980221c04c327b3c165f4a3f82fe470e87e
-rw-r--r--src/devices/nm-device.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index b614894e74..b6f2f3122b 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -6669,8 +6669,9 @@ _commit_mtu (NMDevice *self, const NMIP4Config *config)
NMSettingIPConfig *s_ip6;
s_ip6 = (NMSettingIPConfig *) nm_device_get_applied_setting (self, NM_TYPE_SETTING_IP6_CONFIG);
- if (s_ip6 && nm_streq0 (nm_setting_ip_config_get_method (s_ip6),
- NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) {
+ if ( s_ip6
+ && !NM_IN_STRSET (nm_setting_ip_config_get_method (s_ip6),
+ NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) {
/* the interface has IPv6 enabled. The MTU with IPv6 cannot be smaller
* then 1280.
*