From d0d6a4cd70477970812bff0a37e70f66208d7c14 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Sun, 8 Feb 2015 22:27:15 +0100
Subject: networkd: generalize IPv4LL to LinkLocal

This allows both IPv4 and IPv6 link-local addresses to be enabled or disabled. By default
we still enable IPv6LL and disable IPv4LL. The old config option is kept for backwards
compatibility, but removed from the documentation.
---
 src/network/networkd-ipv4ll.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/network/networkd-ipv4ll.c')

diff --git a/src/network/networkd-ipv4ll.c b/src/network/networkd-ipv4ll.c
index 339bf4d190..8050801e19 100644
--- a/src/network/networkd-ipv4ll.c
+++ b/src/network/networkd-ipv4ll.c
@@ -209,7 +209,7 @@ int ipv4ll_configure(Link *link) {
 
         assert(link);
         assert(link->network);
-        assert(link->network->ipv4ll);
+        assert(IN_SET(link->network->link_local, ADDRESS_FAMILY_IPV4, ADDRESS_FAMILY_YES));
 
         r = sd_ipv4ll_new(&link->ipv4ll);
         if (r < 0)
-- 
cgit v1.2.3-54-g00ecf