fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-01 13:47:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: handle slave deactivation more gracefully

Browse source 
Two things:

1) When the slave was deactivated, nm_device_deactivate() runs before
the master gets the slave's state-changed signal, and thus priv->master
is cleared long before nm_device_notify_enslaved() is called.  Which
would trigger the g_assert (priv->master).

2) If the slave is already deactivated, there's no point in re-queueing
a state change to deactivated.

So just assert that priv->master is valid if the slave is going to be
enslaved, but if the slave is being released, ignore NULL priv->master
which we don't use anyway.  Also ignore redundant state changes.
This commit is contained in:
Dan Williams 2013-01-17 15:44:30 -06:00
parent 7988914e29
commit b6f8ecb330
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/nm-device.c
View file

@ -1017,9 +1017,8 @@ nm_device_slave_notify_enslaved (NMDevice *dev,
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (dev); NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (dev);
NMConnection *connection = nm_device_get_connection (dev); NMConnection *connection = nm_device_get_connection (dev);
g_assert (priv->master);
if (enslaved) { if (enslaved) {
g_assert (priv->master);
g_warn_if_fail (priv->enslaved == FALSE); g_warn_if_fail (priv->enslaved == FALSE);
g_warn_if_fail (priv->state == NM_DEVICE_STATE_IP_CONFIG); g_warn_if_fail (priv->state == NM_DEVICE_STATE_IP_CONFIG);
@ -1039,22 +1038,25 @@ nm_device_slave_notify_enslaved (NMDevice *dev,
NMDeviceState new_state = NM_DEVICE_STATE_DISCONNECTED; NMDeviceState new_state = NM_DEVICE_STATE_DISCONNECTED;
NMDeviceStateReason reason = NM_DEVICE_STATE_REASON_NONE; NMDeviceStateReason reason = NM_DEVICE_STATE_REASON_NONE;
if (master_failed) { if ( priv->state > NM_DEVICE_STATE_DISCONNECTED
new_state = NM_DEVICE_STATE_FAILED; && priv->state <= NM_DEVICE_STATE_ACTIVATED) {
reason = NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED; if (master_failed) {
new_state = NM_DEVICE_STATE_FAILED;
reason = NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED;
nm_log_warn (LOGD_DEVICE, nm_log_warn (LOGD_DEVICE,
"Activation (%s) connection '%s' master failed", "Activation (%s) connection '%s' master failed",
nm_device_get_iface (dev), nm_device_get_iface (dev),
nm_connection_get_id (connection)); nm_connection_get_id (connection));
} else { } else {
nm_log_dbg (LOGD_DEVICE, nm_log_dbg (LOGD_DEVICE,
"Activation (%s) connection '%s' master deactivated", "Activation (%s) connection '%s' master deactivated",
nm_device_get_iface (dev), nm_device_get_iface (dev),
nm_connection_get_id (connection)); nm_connection_get_id (connection));
}
nm_device_queue_state (dev, new_state, reason);
} }
nm_device_queue_state (dev, new_state, reason);
} }
} }