From 953300d48a3cd52ef285c693c4ee552aeaf50d3c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 5 May 2016 11:49:18 +0200 Subject: [PATCH] device: don't cancel queued_ip4_config_id when scheduling activate_stage5_ip4_config_commit Since commit a47c13a7a2cd66644adf2459690f9c3bb96235ab, 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 73cec4e9122dc364a15bab31971449f3aa07cb78) --- src/devices/nm-device.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 4c808be762..a0cb89b424 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -6850,9 +6850,6 @@ nm_device_activate_schedule_ip4_config_result (NMDevice *self, NMIP4Config *conf if (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); }