From ccb789edc2079d7486c5cbc9989a2483bc7c16bf Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sat, 5 Nov 2016 18:37:53 +0100 Subject: [PATCH] device: ipv6.method=link-local does not need slaves It already waits for carrier, which is sufficient -- DAD won't start until there's carrier. --- src/devices/nm-device.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index afc28d408..e67948cb2 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -6666,12 +6666,10 @@ ip6_requires_slaves (NMConnection *connection) method = nm_utils_get_ip_config_method (connection, NM_TYPE_SETTING_IP6_CONFIG); /* SLAAC, DHCP, and Link-Local depend on connectivity (and thus slaves) - * to complete addressing. SLAAC and DHCP obviously need a peer to - * provide a prefix, while Link-Local must perform DAD on the local link. + * to complete addressing. SLAAC and DHCP need a peer to provide a prefix. */ return strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_AUTO) == 0 - || strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_DHCP) == 0 - || strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL) == 0; + || strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_DHCP) == 0; } static NMActStageReturn