From: Jason A. Donenfeld Date: Fri, 26 Jan 2018 14:34:09 +0000 (+0100) Subject: networkd: assume no link local addresses for where it isn't used X-Git-Tag: v237~16^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a8f5bba6a0046edc3a81db1a25785c2863318cdf;p=platform%2Fupstream%2Fsystemd.git networkd: assume no link local addresses for where it isn't used It turns out that link local doesn't make much sense in its context. Since link local is disabled by the kernel driver, it's important that networkd assumes it's off too, so that the link can reach the "configured" stage, without waiting indefinitely for link local addresses which will never come. Signed-off-by: Jason A. Donenfeld --- diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 616f14b..64c4508 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -92,6 +92,9 @@ static bool link_ipv4ll_enabled(Link *link) { if (!link->network) return false; + if (streq_ptr(link->kind, "wireguard")) + return false; + return link->network->link_local & ADDRESS_FAMILY_IPV4; } @@ -107,6 +110,9 @@ static bool link_ipv6ll_enabled(Link *link) { if (!link->network) return false; + if (streq_ptr(link->kind, "wireguard")) + return false; + return link->network->link_local & ADDRESS_FAMILY_IPV6; }