diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-07-09 14:30:12 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-07-09 14:33:57 +0200 |
| commit | a8fa015a4e8ebdc2b032fcad97bd7dfbee07d7b8 (patch) | |
| tree | 75d686406cc927fb6354678ba83a104440974df8 | |
| parent | 7dd95221b78bca816370a045873c627e19e36906 (diff) | |
| download | NetworkManager-a8fa015a4e8ebdc2b032fcad97bd7dfbee07d7b8.tar.gz | |
core: fix mangling static IPv6 routes in nm_ip6_config_merge_setting()
https://bugzilla.redhat.com/show_bug.cgi?id=1727193
Fixes: 433d2f8659e3 ('core: merge IPv4 and IPv6 version of _nm_ip_config_merge_route_attributes()')
| -rw-r--r-- | src/nm-ip6-config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index 9c0763040b..1096fb4246 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -681,7 +681,7 @@ nm_ip6_config_merge_setting (NMIP6Config *self, nm_utils_ip6_address_clear_host_address (&route.network, &route.network, route.plen); - _nm_ip_config_merge_route_attributes (AF_INET, + _nm_ip_config_merge_route_attributes (AF_INET6, s_route, NM_PLATFORM_IP_ROUTE_CAST (&route), route_table); |