summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando Fernandez Mancera <ffmancera@riseup.net>2023-03-07 11:28:01 +0100
committerFernando Fernandez Mancera <ffmancera@riseup.net>2023-03-07 11:28:19 +0100
commit671816b6e64d47e3311b6a07c70b587c650c0e54 (patch)
tree0425045f6caa78dbdb0de970f3e6e8bb65007a76
parent29b559a3005c35643bc5bb2101e07f4bd0a570a6 (diff)
fixup! device: don't cleanup external device when moving to state DISCONNECTEDff/tmp
-rw-r--r--src/core/devices/nm-device.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index a87ed3b853..3680c330f6 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -16101,12 +16101,10 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason,
* userspace IPv6LL enabled.
*/
_dev_addrgenmode6_set(self, NM_IN6_ADDR_GEN_MODE_NONE);
- if (priv->sys_iface_state != NM_DEVICE_SYS_IFACE_STATE_MANAGED) {
+ if (priv->sys_iface_state != NM_DEVICE_SYS_IFACE_STATE_STATE_REMOVED) {
nm_device_cleanup(self,
reason,
- priv->sys_iface_state == NM_DEVICE_SYS_IFACE_STATE_REMOVED
- ? CLEANUP_TYPE_REMOVED
- : CLEANUP_TYPE_KEEP);
+ CLEANUP_TYPE_REMOVED);
} else
nm_device_cleanup(self, reason, CLEANUP_TYPE_DECONFIGURE);