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: 557667df12

https://bugzilla.gnome.org/show_bug.cgi?id=746066
This commit is contained in:
Lubomir Rintel 2015-03-12 07:03:01 +01:00
parent a772fde00d
commit 2e99ddb7a7

View file

@ -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,