|
 |
7b922c |
From 89af6353940018621493764927a3f10335084628 Mon Sep 17 00:00:00 2001
|
|
|
7b922c |
From: Beniamino Galvani <bgalvani@redhat.com>
|
|
|
7b922c |
Date: Fri, 26 Apr 2019 10:49:21 +0200
|
|
|
7b922c |
Subject: [PATCH] device: fix reapply of MTU
|
|
|
7b922c |
|
|
|
7b922c |
When we set the MTU on the link we remember its previous source
|
|
|
7b922c |
(ip-config, parent-device or connection profile) and don't change it
|
|
|
7b922c |
again afterwards to avoid interfering with user's manual changes. The
|
|
|
7b922c |
only exceptions when we change it again are (1) if the parent device
|
|
|
7b922c |
MTU changes and (2) if the new MTU has higher priority than the one
|
|
|
7b922c |
previously set.
|
|
|
7b922c |
|
|
|
7b922c |
To allow a live reapply of the MTU property we also need to clear the
|
|
|
7b922c |
saved source, or the checks described above will prevent setting the
|
|
|
7b922c |
new value.
|
|
|
7b922c |
|
|
|
7b922c |
Fixes: 2f8917237fdf ('device: rework mtu priority handling')
|
|
|
7b922c |
|
|
|
7b922c |
https://bugzilla.redhat.com/show_bug.cgi?id=1702657
|
|
|
7b922c |
(cherry picked from commit 4ed72fa658c03790700ba9084e9328fe38afdee9)
|
|
|
7b922c |
(cherry picked from commit e738479bdd714f754aa311bada3315147efab376)
|
|
|
7b922c |
---
|
|
|
7b922c |
src/devices/nm-device.c | 3 +++
|
|
|
7b922c |
1 file changed, 3 insertions(+)
|
|
|
7b922c |
|
|
|
7b922c |
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
|
|
|
7b922c |
index b909f0ddf..8ae64b968 100644
|
|
|
7b922c |
--- a/src/devices/nm-device.c
|
|
|
7b922c |
+++ b/src/devices/nm-device.c
|
|
|
7b922c |
@@ -11312,6 +11312,9 @@ check_and_reapply_connection (NMDevice *self,
|
|
|
7b922c |
s_ip6_old = nm_connection_get_setting_ip6_config (con_old);
|
|
|
7b922c |
s_ip6_new = nm_connection_get_setting_ip6_config (con_new);
|
|
|
7b922c |
|
|
|
7b922c |
+ /* Allow reapply of MTU */
|
|
|
7b922c |
+ priv->mtu_source = NM_DEVICE_MTU_SOURCE_NONE;
|
|
|
7b922c |
+
|
|
|
7b922c |
nm_device_reactivate_ip4_config (self, s_ip4_old, s_ip4_new);
|
|
|
7b922c |
nm_device_reactivate_ip6_config (self, s_ip6_old, s_ip6_new);
|
|
|
7b922c |
|
|
|
7b922c |
--
|
|
|
7b922c |
2.20.1
|
|
|
7b922c |
|