diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-09-08 09:35:34 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-09-14 17:51:19 +0900 |
commit | e47bcb7d0b2cb07c5c594e374baeb061bb7f88ba (patch) | |
tree | 8d4673cf5b281a64f3f5f6d88382df512a3d33db /src/network/networkd-route.c | |
parent | 967e6a64035df48a5449b5b11bf5fd88ed478954 (diff) | |
download | systemd-e47bcb7d0b2cb07c5c594e374baeb061bb7f88ba.tar.gz |
network: do not use RouteTable= in [DHCPv4] section for DHCPv6 routes
We forgot to add RouteTable= in [DHCPv6] section when we split [DHCP]
into two.
Diffstat (limited to 'src/network/networkd-route.c')
-rw-r--r-- | src/network/networkd-route.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c index c01f1ca14a..7c89e66ab9 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -22,24 +22,6 @@ #define ROUTES_DEFAULT_MAX_PER_FAMILY 4096U -static uint32_t link_get_vrf_table(const Link *link) { - return link->network->vrf ? VRF(link->network->vrf)->table : RT_TABLE_MAIN; -} - -uint32_t link_get_dhcp_route_table(const Link *link) { - /* When the interface is part of an VRF use the VRFs routing table, unless - * another table is explicitly specified. */ - if (link->network->dhcp_route_table_set) - return link->network->dhcp_route_table; - return link_get_vrf_table(link); -} - -uint32_t link_get_ipv6_accept_ra_route_table(const Link *link) { - if (link->network->ipv6_accept_ra_route_table_set) - return link->network->ipv6_accept_ra_route_table; - return link_get_vrf_table(link); -} - static const char * const route_type_table[__RTN_MAX] = { [RTN_UNICAST] = "unicast", [RTN_LOCAL] = "local", |