summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2018-09-12 11:21:44 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2018-09-12 11:21:44 +0200
commitfea0b3e86316c0df9f4cf5f17c935ae7356b2d75 (patch)
tree2bf01aaf3ae06f2bb01f6bff4bd82b483f2ed6ec
parent3a2c6f81f6b0a8dd38d45aa89fa7d6d1f897f149 (diff)
downloadNetworkManager-bg/dcb-timeout.tar.gz
(test) dcb: increase timeoutsbg/dcb-timeout
-rw-r--r--src/devices/nm-device-ethernet.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index a9a9f968e6..4e033a9a74 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -1070,7 +1070,7 @@ dcb_configure (NMDevice *device)
*/
_LOGD (LOGD_DCB, "waiting for carrier (postconfig down)");
priv->dcb_wait = DCB_WAIT_CARRIER_POSTCONFIG_DOWN;
- priv->dcb_timeout_id = g_timeout_add_seconds (3, dcb_carrier_timeout, device);
+ priv->dcb_timeout_id = g_timeout_add_seconds (10, dcb_carrier_timeout, device);
return TRUE;
}
@@ -1098,7 +1098,7 @@ dcb_enable (NMDevice *device)
*/
_LOGD (LOGD_DCB, "waiting for carrier (preconfig down)");
priv->dcb_wait = DCB_WAIT_CARRIER_PRECONFIG_DOWN;
- priv->dcb_timeout_id = g_timeout_add_seconds (3, dcb_carrier_timeout, device);
+ priv->dcb_timeout_id = g_timeout_add_seconds (10, dcb_carrier_timeout, device);
return TRUE;
}
@@ -1134,7 +1134,7 @@ dcb_state (NMDevice *device, gboolean timeout)
if (!carrier) {
/* Wait for the carrier to come back up */
_LOGD (LOGD_DCB, "waiting for carrier (preconfig up)");
- priv->dcb_timeout_id = g_timeout_add_seconds (5, dcb_carrier_timeout, device);
+ priv->dcb_timeout_id = g_timeout_add_seconds (10, dcb_carrier_timeout, device);
break;
}
_LOGD (LOGD_DCB, "dcb_state() preconfig down falling through");
@@ -1158,7 +1158,7 @@ dcb_state (NMDevice *device, gboolean timeout)
if (!carrier) {
/* Wait for the carrier to come back up */
_LOGD (LOGD_DCB, "waiting for carrier (postconfig up)");
- priv->dcb_timeout_id = g_timeout_add_seconds (5, dcb_carrier_timeout, device);
+ priv->dcb_timeout_id = g_timeout_add_seconds (10, dcb_carrier_timeout, device);
break;
}
_LOGD (LOGD_DCB, "dcb_state() postconfig down falling through");
@@ -1266,7 +1266,7 @@ act_stage2_config (NMDevice *device, NMDeviceStateReason *out_failure_reason)
} else {
_LOGD (LOGD_DCB, "waiting for carrier (preenable up)");
priv->dcb_wait = DCB_WAIT_CARRIER_PREENABLE_UP;
- priv->dcb_timeout_id = g_timeout_add_seconds (4, dcb_carrier_timeout, device);
+ priv->dcb_timeout_id = g_timeout_add_seconds (10, dcb_carrier_timeout, device);
}
priv->dcb_handle_carrier_changes = TRUE;