diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-03-12 07:03:01 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-03-13 08:21:57 +0100 |
| commit | 2e99ddb7a7e65e74846d344b456c4ab4f2ce2ba7 (patch) | |
| tree | a601a752adcdc7233efed528b3ca506bc425dd0a | |
| parent | a772fde00d50e134500942aaf039cd4fa28951da (diff) | |
| download | NetworkManager-2e99ddb7a7e65e74846d344b456c4ab4f2ce2ba7.tar.gz | |
device: unschedule ip update if we just scheduled ip configuration
It would subtract the configuration from device confguration that's not yet
applied. This a the race where the loose the address while activating a
connection that has both IPv6 and IPv4 configuration.
Fixes: 557667df12fc05b76326d6406553985effeeb2ac
https://bugzilla.gnome.org/show_bug.cgi?id=746066
| -rw-r--r-- | src/devices/nm-device.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 89832d6ec0..bb338e07a4 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -5423,6 +5423,7 @@ nm_device_activate_schedule_ip4_config_result (NMDevice *self, NMIP4Config *conf if (config) priv->dev_ip4_config = g_object_ref (config); + nm_device_queued_ip_config_change_clear (self); activation_source_schedule (self, nm_device_activate_ip4_config_commit, AF_INET); _LOGI (LOGD_DEVICE | LOGD_IP4, |