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

nm-device-ethernet: refactor act_stage1_prepare code

Browse Source 
Refactored the code a bit without changing functionality: let the function
immediately return on error.
This commit is contained in:
Francesco Giudici
2016-09-08 18:12:37 +02:00
parent 16fdef33dd
commit 61faa5080e
1 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/devices/nm-device-ethernet.c
View File

@@ -799,40 +799,39 @@ act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
{ {
NMDeviceEthernet *self = NM_DEVICE_ETHERNET (dev); NMDeviceEthernet *self = NM_DEVICE_ETHERNET (dev);
NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self); NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
NMActStageReturn ret = NM_ACT_STAGE_RETURN_SUCCESS; NMActStageReturn ret;
g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE); g_return_val_if_fail (reason != NULL, NM_ACT_STAGE_RETURN_FAILURE);
ret = NM_DEVICE_CLASS (nm_device_ethernet_parent_class)->act_stage1_prepare (dev, reason); ret = NM_DEVICE_CLASS (nm_device_ethernet_parent_class)->act_stage1_prepare (dev, reason);
if (ret == NM_ACT_STAGE_RETURN_SUCCESS) { if (ret != NM_ACT_STAGE_RETURN_SUCCESS)
if (!nm_device_hw_addr_set_cloned (dev, nm_device_get_applied_connection (dev), FALSE)) return ret;
ret = NM_ACT_STAGE_RETURN_FAILURE;
}
if (ret == NM_ACT_STAGE_RETURN_SUCCESS) { if (!nm_device_hw_addr_set_cloned (dev, nm_device_get_applied_connection (dev), FALSE))
/* If we're re-activating a PPPoE connection a short while after return NM_ACT_STAGE_RETURN_FAILURE;
* a previous PPPoE connection was torn down, wait a bit to allow the
* remote side to handle the disconnection. Otherwise the peer may
* get confused and fail to negotiate the new connection. (rh #1023503)
*/
if (priv->last_pppoe_time) {
gint32 delay = nm_utils_get_monotonic_timestamp_s () - priv->last_pppoe_time;
if ( delay < PPPOE_RECONNECT_DELAY /* If we're re-activating a PPPoE connection a short while after
&& nm_device_get_applied_setting (dev, NM_TYPE_SETTING_PPPOE)) { * a previous PPPoE connection was torn down, wait a bit to allow the
_LOGI (LOGD_DEVICE, "delaying PPPoE reconnect for %d seconds to ensure peer is ready...", * remote side to handle the disconnection. Otherwise the peer may
delay); * get confused and fail to negotiate the new connection. (rh #1023503)
g_assert (!priv->pppoe_wait_id); */
priv->pppoe_wait_id = g_timeout_add_seconds (delay, if (priv->last_pppoe_time) {
pppoe_reconnect_delay, gint32 delay = nm_utils_get_monotonic_timestamp_s () - priv->last_pppoe_time;
self);
ret = NM_ACT_STAGE_RETURN_POSTPONE; if ( delay < PPPOE_RECONNECT_DELAY
} else && nm_device_get_applied_setting (dev, NM_TYPE_SETTING_PPPOE)) {
priv->last_pppoe_time = 0; _LOGI (LOGD_DEVICE, "delaying PPPoE reconnect for %d seconds to ensure peer is ready...",
delay);
g_assert (!priv->pppoe_wait_id);
priv->pppoe_wait_id = g_timeout_add_seconds (delay,
pppoe_reconnect_delay,
self);
return NM_ACT_STAGE_RETURN_POSTPONE;
} }
priv->last_pppoe_time = 0;
} }
return ret; return NM_ACT_STAGE_RETURN_SUCCESS;
} }
static NMActStageReturn static NMActStageReturn