diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2017-11-17 11:33:06 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2017-11-17 13:43:16 +0100 |
| commit | a0cd75b20c4bda0eb38c1c4b356d5da95822f592 (patch) | |
| tree | b825edcce00f2f43e3c89670d77a718a3a41b7cc /src/nm-ip6-config.c | |
| parent | 8f677a77728c1f4434283d1a39f501c48eaef654 (diff) | |
| download | NetworkManager-a0cd75b20c4bda0eb38c1c4b356d5da95822f592.tar.gz | |
core: don't reset existing routes when merging IP setting
Don't reset existing routes if ipvx.ignore-auto-routes=yes: callers
should already avoid adding them when not needed.
Previously we would also reset the manual gateway route just added.
Fixes: 5c299454b49b165f645c25fd3e083c0bb747ad91
https://bugzilla.gnome.org/show_bug.cgi?id=790423
Diffstat (limited to 'src/nm-ip6-config.c')
| -rw-r--r-- | src/nm-ip6-config.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index 28841e3434..2cb34968ac 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -629,8 +629,6 @@ nm_ip6_config_merge_setting (NMIP6Config *self, } /* Routes */ - if (nm_setting_ip_config_get_ignore_auto_routes (setting)) - nm_ip6_config_reset_routes (self); for (i = 0; i < nroutes; i++) { NMIPRoute *s_route = nm_setting_ip_config_get_route (setting, i); NMPlatformIP6Route route; |