aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2015-02-08 22:27:15 +0100
committerTom Gundersen <teg@jklm.no>2015-02-09 12:20:10 +0100
commitd0d6a4cd70477970812bff0a37e70f66208d7c14 (patch)
treed0cf5c3ff73e39e5057d7ed81e6e49c5732b70e0 /src/network/networkd-ipv4ll.c
parentsd-rtnl: fix typesystem for IFLA_AF_SPEC (diff)
downloadsystemd-d0d6a4cd70477970812bff0a37e70f66208d7c14.tar.gz
systemd-d0d6a4cd70477970812bff0a37e70f66208d7c14.tar.bz2
systemd-d0d6a4cd70477970812bff0a37e70f66208d7c14.zip
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.
Diffstat (limited to 'src/network/networkd-ipv4ll.c')
-rw-r--r--src/network/networkd-ipv4ll.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/networkd-ipv4ll.c b/src/network/networkd-ipv4ll.c
index 339bf4d19..8050801e1 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)