From d231162fbc3ed193d3e0a4a35d668dd5deb97f6c Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 20 Apr 2015 18:01:58 +0200 Subject: [PATCH] nm-ip[64]-config: set ifindex when replacing a duplicate route Otherwise it stays zero and hits an assertion when the route is applied: NetworkManager:ERROR:nm-route-manager.c:179:nm_route_manager_ip4_route_sync: assertion failed: (known_route->ifindex) https://bugzilla.gnome.org/show_bug.cgi?id=745844 --- src/nm-ip4-config.c | 1 + src/nm-ip6-config.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index 8b1596dd0d..abc8af836a 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -1288,6 +1288,7 @@ nm_ip4_config_add_route (NMIP4Config *config, const NMPlatformIP4Route *new) memcpy (item, new, sizeof (*item)); /* Restore highest priority source */ item->source = MAX (old_source, new->source); + item->ifindex = priv->ifindex; goto NOTIFY; } } diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index 2077af81b3..9d4bf47b20 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -1289,6 +1289,7 @@ nm_ip6_config_add_route (NMIP6Config *config, const NMPlatformIP6Route *new) *item = *new; /* Restore highest priority source */ item->source = MAX (old_source, new->source); + item->ifindex = priv->ifindex; goto NOTIFY; } }