summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWen Liang <liangwen12year@gmail.com>2022-12-14 13:37:47 -0500
committerWen Liang <liangwen12year@gmail.com>2022-12-19 10:36:47 -0500
commit4c587561c631dca33df19c32d26617b9654b4490 (patch)
tree00d2f03fcc1e2c39f6308932f3541133993ba1b0
parent460b8392d760017ffa054d97f3b4e5dc80ffb27f (diff)
downloadNetworkManager-wl/tmp.tar.gz
device: clear the previous lease with dhcp disabled during reapplywl/tmp
-rw-r--r--src/core/devices/nm-device.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index 8d433d335d..780e586188 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -12214,6 +12214,9 @@ activate_stage3_ip_config(NMDevice *self)
_dev_ipmanual_start(self);
}
+ if (!nm_streq(ipv4_method, NM_SETTING_IP4_CONFIG_METHOD_AUTO))
+ nm_clear_l3cd(priv->l3cds[L3_CONFIG_DATA_TYPE_DHCP_X(TRUE)].d);
+
activate_stage3_ip_config_for_addr_family(self, AF_INET, ipv4_method);
activate_stage3_ip_config_for_addr_family(self, AF_INET6, ipv6_method);
}