diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-04-20 18:01:58 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-04-20 21:45:47 +0200 |
| commit | 36cff2d5d642c949ba267f5be75f537e2848867c (patch) | |
| tree | f53378b54b428dba30830d081bd09ee0e3d43e1b | |
| parent | e3ee72f6dc844a5d14ba8e613925510fbf703da5 (diff) | |
| download | NetworkManager-lr/trivial.tar.gz | |
nm-ip[64]-config: set ifindex when replacing a duplicate routelr/trivial
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
| -rw-r--r-- | src/nm-ip4-config.c | 1 | ||||
| -rw-r--r-- | src/nm-ip6-config.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index 10e2b62c62..26e1f404ad 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 4df7e2996f..3f0357a16c 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; } } |