From 7218b8d069fba469825c8aaa0ad38bc10ae7ae6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20=C5=A0imerda?= Date: Wed, 26 Jun 2013 00:25:24 +0200 Subject: [PATCH] core: always commit DHCPv4 config DHCPv4 config can change even during connection assumption. --- src/devices/nm-device.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index d109f9f504..0dca221501 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -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);