From a8fa015a4e8ebdc2b032fcad97bd7dfbee07d7b8 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()') --- 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 9c0763040..1096fb424 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);