From 5b0295533ead296ca1c675f239a203ba4a81a9f3 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 22 Jul 2015 16:05:36 +0200 Subject: [PATCH] Include the correct patch --- ...nager-pick-up-platform-changes-after.patch | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 0001-default-route-manager-pick-up-platform-changes-after.patch diff --git a/0001-default-route-manager-pick-up-platform-changes-after.patch b/0001-default-route-manager-pick-up-platform-changes-after.patch deleted file mode 100644 index d4980da..0000000 --- a/0001-default-route-manager-pick-up-platform-changes-after.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e6cd05f97cf204c81b427b44581a8982824bb401 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Wed, 22 Jul 2015 10:33:49 +0200 -Subject: [PATCH 1/2] default-route-manager: pick up platform changes after - NMDevice - -If a default route is configured externally, we want the device to pick the -change and register it with the default-route-manager first. - -https://bugzilla.redhat.com/show_bug.cgi?id=1244483 -(cherry picked from commit d4566d00da11e63bac56e0bb41a5f0f96903def3) ---- - src/nm-default-route-manager.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/nm-default-route-manager.c b/src/nm-default-route-manager.c -index fbb07ce..b36dd44 100644 ---- a/src/nm-default-route-manager.c -+++ b/src/nm-default-route-manager.c -@@ -1290,7 +1290,9 @@ _resync_idle_reschedule (NMDefaultRouteManager *self) - g_source_remove (priv->resync.idle_handle); - else - _LOGD (0, "resync: schedule on idle"); -- priv->resync.idle_handle = g_idle_add ((GSourceFunc) _resync_idle_now, self); -+ /* Schedule this at low priority so that on an external change to platform -+ * a NMDevice has a chance to picks up the changes first. */ -+ priv->resync.idle_handle = g_idle_add_full (G_PRIORITY_LOW, (GSourceFunc) _resync_idle_now, self, NULL); - } else if (!priv->resync.idle_handle) { - priv->resync.idle_handle = g_timeout_add (priv->resync.backoff_wait_time_ms, (GSourceFunc) _resync_idle_now, self); - _LOGD (0, "resync: schedule in %u.%03u seconds (%u)", priv->resync.backoff_wait_time_ms/1000, --- -2.4.3 -