fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-29 02:10:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: postpone non-static master IP configuration until carrier

Browse source 
This got broken at some point.  The intent of ignore-carrier was always
to ignore the carrier for IP configuration for static/manual connections,
but never for DHCP/SLAAC where a link is actually required.  Thus
when checking whether to postpone IP configuration for a master interface
that's using DHCP/SLAAC, don't allow ignore-carrier to factor into
the decision.
This commit is contained in:
Dan Williams 2014-02-25 18:00:34 -06:00
parent 1d5847c8a6
commit 3a7f07e2f0
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/devices/nm-device.c
View file

@ -1085,17 +1085,6 @@ nm_device_has_carrier (NMDevice *device)
return NM_DEVICE_GET_PRIVATE (device)->carrier;
}
/* Returns %TRUE if @device is unavailable for connections because it
* needs carrier but does not have it.
*/
static gboolean
nm_device_is_unavailable_because_of_carrier (NMDevice *device)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device);
return !priv->carrier && !priv->ignore_carrier;
}
#define LINK_DISCONNECT_DELAY 4
static gboolean
@ -2917,7 +2906,7 @@ act_stage3_ip4_config_start (NMDevice *self,
if ( strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL) != 0
&& nm_device_is_master (self)
&& nm_device_is_unavailable_because_of_carrier (self)) {
&& !priv->carrier) {
nm_log_info (LOGD_IP4 | LOGD_DEVICE,
"(%s): IPv4 config waiting until carrier is on",
nm_device_get_ip_iface (self));
@ -3685,7 +3674,7 @@ act_stage3_ip6_config_start (NMDevice *self,
if ( strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_MANUAL) != 0
&& nm_device_is_master (self)
&& nm_device_is_unavailable_because_of_carrier (self)) {
&& !priv->carrier) {
nm_log_info (LOGD_IP6 | LOGD_DEVICE,
"(%s): IPv6 config waiting until carrier is on", ip_iface);
return NM_ACT_STAGE_RETURN_WAIT;
@ -4893,10 +4882,13 @@ nm_device_is_activating (NMDevice *device)
static gboolean
can_interrupt_activation (NMDevice *device)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device);
/* Devices that support carrier detect can interrupt activation
* if the link becomes inactive.
* if the link becomes inactive and carrier is honored.
*/
return nm_device_is_unavailable_because_of_carrier (device);
return !priv->carrier && !priv->ignore_carrier;
}
gboolean