core: fix mangling static IPv6 routes in nm_ip6_config_merge_setting()

https://bugzilla.redhat.com/show_bug.cgi?id=1727193

Fixes: 433d2f8659 ('core: merge IPv4 and IPv6 version of _nm_ip_config_merge_route_attributes()')
(cherry picked from commit a8fa015a4e)
(cherry picked from commit 44e4ed1e95)
(cherry picked from commit d3b7b0d286)
(cherry picked from commit 8f85b6a3af)
This commit is contained in:
Thomas Haller 2019-07-09 14:30:12 +02:00
parent 17709225ec
commit ccd8afb4c1

View file

@ -671,7 +671,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);