fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 13:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: don't cancel queued_ip4_config_id when scheduling activate_stage5_ip4_config_commit

Browse source 
Since commit a47c13a7a2, update_ip4_config() re-schedules
itself in case activate_stage5_ip4_config_commit is pending. Thus, there is no need to
cancel any queued queued_ip4_config_id.

Also as that does not properly fix the issue unlike a47c13a7a.

(cherry picked from commit 73cec4e912)
This commit is contained in:
Thomas Haller 2016-05-05 11:49:18 +02:00
parent 1f04cef99d
commit 953300d48a
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6850,9 +6850,6 @@ nm_device_activate_schedule_ip4_config_result (NMDevice *self, NMIP4Config *conf
if (config) if (config)
priv->dev_ip4_config = g_object_ref (config); priv->dev_ip4_config = g_object_ref (config);
if (nm_clear_g_source (&priv->queued_ip4_config_id))
_LOGD (LOGD_DEVICE, "clearing queued IP4 config change");
activation_source_schedule (self, activate_stage5_ip4_config_commit, AF_INET); activation_source_schedule (self, activate_stage5_ip4_config_commit, AF_INET);
} }