From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 16 Feb 2019 16:15:19 +0000 (+0900)
Subject: network: disable link local addressing on vrf
X-Git-Tag: v242-rc1~303^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89b9a975739889541839bb56c1e78bebeeb77709;p=thirdparty%2Fsystemd.git

network: disable link local addressing on vrf

See the commment in vrf_link_scope_lookup() in drivers/net/vrf.c of
Linux kernel.
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 24946b1df82..e9c814ade54 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -106,7 +106,7 @@ static bool link_ipv4ll_enabled(Link *link) {
         if (!link->network)
                 return false;
 
-        if (streq_ptr(link->kind, "wireguard"))
+        if (STRPTR_IN_SET(link->kind, "vrf", "wireguard"))
                 return false;
 
         return link->network->link_local & ADDRESS_FAMILY_IPV4;
@@ -124,7 +124,7 @@ static bool link_ipv6ll_enabled(Link *link) {
         if (!link->network)
                 return false;
 
-        if (streq_ptr(link->kind, "wireguard"))
+        if (STRPTR_IN_SET(link->kind, "vrf", "wireguard"))
                 return false;
 
         return link->network->link_local & ADDRESS_FAMILY_IPV6;