diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-11-18 14:17:16 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-11-19 17:37:27 +0100 |
| commit | f7418c6005579d864121ef4d9635344c0bff5e7b (patch) | |
| tree | ba2cd3d27e84e2730bfbdfbf8f311f4ce6bd10de | |
| parent | 91c2224e2645a76fa419711ac245c594de4d3757 (diff) | |
| download | NetworkManager-f7418c6005579d864121ef4d9635344c0bff5e7b.tar.gz | |
fixup! policy: resync routes on platform change events
| -rw-r--r-- | src/nm-default-route-manager.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nm-default-route-manager.c b/src/nm-default-route-manager.c index 1eca01ed7d..ec1d07c741 100644 --- a/src/nm-default-route-manager.c +++ b/src/nm-default-route-manager.c @@ -38,7 +38,7 @@ typedef struct { GPtrArray *entries_ip4; GPtrArray *entries_ip6; struct { - guint reentrancy_guard; + guint guard; guint backoff_wait_time_ms; guint idle_handle; gboolean has_v4_changes; @@ -401,8 +401,8 @@ _resync_all (const VTableIP *vtable, NMDefaultRouteManager *self, const Entry *c GArray *routes; gboolean changed = FALSE; - g_assert (priv->resync.reentrancy_guard == 0); - priv->resync.reentrancy_guard++; + g_assert (priv->resync.guard == 0); + priv->resync.guard++; if (!external_change) { if (VTABLE_IS_IP4) @@ -525,7 +525,7 @@ _resync_all (const VTableIP *vtable, NMDefaultRouteManager *self, const Entry *c g_hash_table_unref (changed_metrics); g_hash_table_unref (assumed_metrics); - priv->resync.reentrancy_guard--; + priv->resync.guard--; return changed; } @@ -1186,7 +1186,7 @@ _platform_ipx_route_changed_cb (const VTableIP *vtable, priv = NM_DEFAULT_ROUTE_MANAGER_GET_PRIVATE (self); - if (priv->resync.reentrancy_guard) { + if (priv->resync.guard) { /* callbacks while executing _resync_all() are ignored. */ return; } |