From 86655331bc28887def7998d321b14ef8fccbeaf9 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Mon, 26 Oct 2015 17:04:57 +0100 Subject: networkd: route - clean up confusion between 'metric' and 'priority' Different tools use different terms for the same concept, let's try to stick with 'priority', as that is what the netlink API uses. --- src/network/networkd-dhcp4.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/network/networkd-dhcp4.c') diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index 4f7f595adc..05a16f4033 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -92,7 +92,7 @@ static int link_set_dhcp_routes(Link *link) { route_gw->prefsrc.in = address; route_gw->scope = RT_SCOPE_LINK; route_gw->protocol = RTPROT_DHCP; - route_gw->metrics = link->network->dhcp_route_metric; + route_gw->priority = link->network->dhcp_route_metric; r = route_configure(route_gw, link, &dhcp4_route_handler); if (r < 0) @@ -103,7 +103,7 @@ static int link_set_dhcp_routes(Link *link) { route->family = AF_INET; route->gw.in = gateway; route->prefsrc.in = address; - route->metrics = link->network->dhcp_route_metric; + route->priority = link->network->dhcp_route_metric; r = route_configure(route, link, &dhcp4_route_handler); if (r < 0) { @@ -133,7 +133,7 @@ static int link_set_dhcp_routes(Link *link) { route->gw.in = static_routes[i].gw_addr; route->dst.in = static_routes[i].dst_addr; route->dst_prefixlen = static_routes[i].dst_prefixlen; - route->metrics = link->network->dhcp_route_metric; + route->priority = link->network->dhcp_route_metric; r = route_configure(route, link, &dhcp4_route_handler); if (r < 0) -- cgit v1.2.3-54-g00ecf