From ccd8afb4c122b620f7fb1ea15cf0c14e52292ea2 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 9 Jul 2019 14:30:12 +0200 Subject: [PATCH] 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()') (cherry picked from commit a8fa015a4e8ebdc2b032fcad97bd7dfbee07d7b8) (cherry picked from commit 44e4ed1e950ad7933e68324ab8b80757599dea44) (cherry picked from commit d3b7b0d2867a2a340e85c7b5668084851a8fd042) (cherry picked from commit 8f85b6a3afa876e5c07416957acb80dcf2a19b31) --- src/nm-ip6-config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index e542f2cc72..8de804971d 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -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);