diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-07-22 10:33:16 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-07-23 15:29:24 +0200 |
| commit | 4127c88ad2120ce9ad7cac78d972d90aaee0d3d0 (patch) | |
| tree | 776b0196818ad1270d06bf6c81ca60868fec242a /src/nm-ip6-config.c | |
| parent | 348d721b3fffbf187361380b3779b611bab353c1 (diff) | |
| download | NetworkManager-4127c88ad2120ce9ad7cac78d972d90aaee0d3d0.tar.gz | |
core: move _nm_ip_config_merge_route_attributes() to "NetworkManagerUtils.c"
and rename to nm_utils_ip_route_attribute_to_platform(). The function is independent
from NMIP4Config. We also will use it outside of NMIP4Config. Also, "NetworkManagerUtils.c"
already has similar functions that parse libnm structures to internal structures.
Diffstat (limited to 'src/nm-ip6-config.c')
| -rw-r--r-- | src/nm-ip6-config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index 9c596bf95d..6c15e99765 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -721,10 +721,10 @@ 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_INET6, - s_route, - NM_PLATFORM_IP_ROUTE_CAST (&route), - route_table); + nm_utils_ip_route_attribute_to_platform (AF_INET6, + s_route, + NM_PLATFORM_IP_ROUTE_CAST (&route), + route_table); _add_route (self, NULL, &route, NULL); } |