diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-04-18 02:31:13 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-04-21 13:55:02 +0900 |
| commit | 8ebafba9f987c21aa5787c8767f2e390b4ec0bc5 (patch) | |
| tree | 618dc66e6aa4ba10c3b4503b3fd52e9eccabd0b8 /src/network/networkd-ndisc.c | |
| parent | 415deef9c3e97211c862f39aceabf8e1f1485a41 (diff) | |
| download | systemd-8ebafba9f987c21aa5787c8767f2e390b4ec0bc5.tar.gz | |
network: move RouteMetric= from [DHCPv6] to [IPv6AcceptRA]
As the value is used in the routes in RA.
Diffstat (limited to 'src/network/networkd-ndisc.c')
| -rw-r--r-- | src/network/networkd-ndisc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c index 7a975f3a91..b02f67c770 100644 --- a/src/network/networkd-ndisc.c +++ b/src/network/networkd-ndisc.c @@ -530,7 +530,7 @@ static int ndisc_router_process_default(Link *link, sd_ndisc_router *rt) { route->family = AF_INET6; route->table = table; - route->priority = link->network->dhcp6_route_metric; + route->priority = link->network->ipv6_accept_ra_route_metric; route->protocol = RTPROT_RA; route->pref = preference; route->gw_family = AF_INET6; @@ -554,7 +554,7 @@ static int ndisc_router_process_default(Link *link, sd_ndisc_router *rt) { if (!route_gw->table_set) route_gw->table = table; if (!route_gw->priority_set) - route_gw->priority = link->network->dhcp6_route_metric; + route_gw->priority = link->network->ipv6_accept_ra_route_metric; if (!route_gw->protocol_set) route_gw->protocol = RTPROT_RA; if (!route_gw->pref_set) @@ -814,7 +814,7 @@ static int ndisc_router_process_onlink_prefix(Link *link, sd_ndisc_router *rt) { route->family = AF_INET6; route->table = link_get_ipv6_accept_ra_route_table(link); - route->priority = link->network->dhcp6_route_metric; + route->priority = link->network->ipv6_accept_ra_route_metric; route->protocol = RTPROT_RA; route->flags = RTM_F_PREFIX; route->dst_prefixlen = prefixlen; @@ -899,7 +899,7 @@ static int ndisc_router_process_route(Link *link, sd_ndisc_router *rt) { route->family = AF_INET6; route->table = link_get_ipv6_accept_ra_route_table(link); - route->priority = link->network->dhcp6_route_metric; + route->priority = link->network->ipv6_accept_ra_route_metric; route->protocol = RTPROT_RA; route->pref = preference; route->gw = gateway; |