merge: branch 'pre-down-no-network-fix'

device: don't enforce IP cleanup on deactivating state

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2016
This commit is contained in:
Fernando Fernández Mancera
2024-08-22 12:25:49 +00:00

View File

@@ -16893,10 +16893,6 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason,
_cleanup_ip_pre(self, AF_INET6, CLEANUP_TYPE_DECONFIGURE, FALSE);
}
break;
case NM_DEVICE_STATE_DEACTIVATING:
/* If we are now deactivating we should enforce IP cleanup. */
_cleanup_ip_pre(self, AF_INET, CLEANUP_TYPE_DECONFIGURE, FALSE);
_cleanup_ip_pre(self, AF_INET6, CLEANUP_TYPE_DECONFIGURE, FALSE);
default:
break;
}