From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 12 May 2019 21:51:54 +0000 (+0900)
Subject: network: disable link local addressing on ipip, gre, sit, and vti netdevs
X-Git-Tag: v243-rc1~431^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af2fa2c116368618e0a79e3081ea8aa20b3b9bf8;p=thirdparty%2Fsystemd.git

network: disable link local addressing on ipip, gre, sit, and vti netdevs

Closes #12547.
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 2398ef79366..f8ee48802cb 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -121,7 +121,7 @@ bool link_ipv4ll_enabled(Link *link) {
         if (!link->network)
                 return false;
 
-        if (STRPTR_IN_SET(link->kind, "vrf", "wireguard"))
+        if (STRPTR_IN_SET(link->kind, "vrf", "wireguard", "ipip", "gre", "ip6gre", "ip6tnl", "sit", "vti", "vti6"))
                 return false;
 
         if (link->network->bond)
@@ -139,7 +139,7 @@ bool link_ipv4ll_fallback_enabled(Link *link) {
         if (!link->network)
                 return false;
 
-        if (STRPTR_IN_SET(link->kind, "vrf", "wireguard"))
+        if (STRPTR_IN_SET(link->kind, "vrf", "wireguard", "ipip", "gre", "ip6gre", "ip6tnl", "sit", "vti", "vti6"))
                 return false;
 
         if (link->network->bond)
@@ -160,7 +160,7 @@ static bool link_ipv6ll_enabled(Link *link) {
         if (!link->network)
                 return false;
 
-        if (STRPTR_IN_SET(link->kind, "vrf", "wireguard"))
+        if (STRPTR_IN_SET(link->kind, "vrf", "wireguard", "ipip", "gre", "sit", "vti"))
                 return false;
 
         if (link->network->bond)