From 14cfffa64c5f0c20aa10b6ccdea1bb1a6e7f7129 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Tue, 11 Jun 2019 15:16:57 +0200 Subject: [PATCH] device: reset cached route tables when starting new activation The values cached in the device may be stale when we start a new activation because in a disconnected state we might have called ip_config_merge_and_apply() which cached the main table value. (cherry picked from commit 5be69ba79470f35ca2b10f0e189a0a5a3fac6f28) --- src/devices/nm-device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 52cf8631b5..3f5c15a5a3 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -6337,6 +6337,9 @@ activate_stage1_device_prepare (NMDevice *self) NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); NMActStageReturn ret = NM_ACT_STAGE_RETURN_SUCCESS; + priv->v4_route_table_initialized = FALSE; + priv->v6_route_table_initialized = FALSE; + _set_ip_state (self, AF_INET, NM_DEVICE_IP_STATE_NONE); _set_ip_state (self, AF_INET6, NM_DEVICE_IP_STATE_NONE);