diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-03-27 08:56:35 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2023-03-27 08:56:35 +0200 |
| commit | f2eae12c84b9b8800596e11a6c90fadbeb93d16f (patch) | |
| tree | 7867bdf75578a328a46b59cdfa7662952005719d | |
| parent | 1395cc09bd79601ab52e390ee4dcef7f90796bdb (diff) | |
| parent | 15101447c327044d8657ef961245fa9b703880aa (diff) | |
core: merge branch 'th/mtu-during-assume'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1576
| -rw-r--r-- | src/core/devices/nm-device.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 497108b1c1..6723d1415a 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -3043,6 +3043,7 @@ nm_device_sys_iface_state_set(NMDevice *self, NMDeviceSysIfaceState sys_iface_st nm_device_sys_iface_state_to_string(sys_iface_state)); priv->sys_iface_state_ = sys_iface_state; _dev_l3_cfg_commit_type_reset(self); + nm_device_l3cfg_commit(self, NM_L3_CFG_COMMIT_TYPE_AUTO, FALSE); } /* this function only sets a flag, no immediate actions are initiated. @@ -11326,10 +11327,8 @@ _commit_mtu(NMDevice *self) if (ifindex <= 0) return; - if (!nm_device_get_applied_connection(self) - || nm_device_sys_iface_state_is_external_or_assume(self)) { - /* we don't tamper with the MTU of disconnected and - * external/assumed devices. */ + if (!nm_device_get_applied_connection(self) || nm_device_sys_iface_state_is_external(self)) { + /* we don't tamper with the MTU of disconnected and external devices. */ return; } |