colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

device: ipv6.method=link-local does not need slaves

Browse Source 
It already waits for carrier, which is sufficient -- DAD won't start
until there's carrier.
This commit is contained in:
Lubomir Rintel
2016-11-05 18:37:53 +01:00
parent f708184d6f
commit ccb789edc2
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/devices/nm-device.c
View File

@@ -6666,12 +6666,10 @@ ip6_requires_slaves (NMConnection *connection)
method = nm_utils_get_ip_config_method (connection, NM_TYPE_SETTING_IP6_CONFIG); method = nm_utils_get_ip_config_method (connection, NM_TYPE_SETTING_IP6_CONFIG);
/* SLAAC, DHCP, and Link-Local depend on connectivity (and thus slaves) /* SLAAC, DHCP, and Link-Local depend on connectivity (and thus slaves)
* to complete addressing. SLAAC and DHCP obviously need a peer to * to complete addressing. SLAAC and DHCP need a peer to provide a prefix.
* provide a prefix, while Link-Local must perform DAD on the local link.
*/ */
return strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_AUTO) == 0 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_DHCP) == 0;
|| strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL) == 0;
} }
static NMActStageReturn static NMActStageReturn