fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-29 17:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: always commit DHCPv4 config

Browse source 
DHCPv4 config can change even during connection assumption.
This commit is contained in:
Pavel Šimerda 2013-06-26 00:25:24 +02:00
parent 941ab71279
commit 7218b8d069
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/devices/nm-device.c
View file

@ -3671,7 +3671,6 @@ nm_device_activate_ip4_config_commit (gpointer user_data)
NMConnection *connection;
NMSettingIP4Config *s_ip4;
NMDeviceStateReason reason = NM_DEVICE_STATE_REASON_NONE;
gboolean assumed;
int ifindex;
/* Clear the activation source ID now that this stage has run */
@ -3701,8 +3700,7 @@ nm_device_activate_ip4_config_commit (gpointer user_data)
/* Merge with user overrides */
nm_utils_merge_ip4_config (config, nm_connection_get_setting_ip4_config (connection));
assumed = nm_active_connection_get_assumed (NM_ACTIVE_CONNECTION (priv->act_request));
if (!nm_device_set_ip4_config (self, config, !assumed, &reason)) {
if (!nm_device_set_ip4_config (self, config, TRUE, &reason)) {
nm_log_info (LOGD_DEVICE | LOGD_IP4,
"Activation (%s) Stage 5 of 5 (IPv4 Commit) failed",
iface);