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

device: reset SR-IOV parameters on activation failure

Browse source 
SR-IOV parameters are reset when deactivating a connection; do the
same also on failure.

https://bugzilla.redhat.com/show_bug.cgi?id=1819587
(cherry picked from commit 4d6ea18de4)
This commit is contained in:
Beniamino Galvani 2020-04-01 11:23:15 +02:00
parent b140adc40d
commit ef9f26a1bf
1 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15928,7 +15928,7 @@ deactivate_ready (NMDevice *self, NMDeviceStateReason reason)
}
static void
sriov_deactivate_cb (GError *error, gpointer user_data)
sriov_reset_on_deactivate_cb (GError *error, gpointer user_data)
{
NMDevice *self;
NMDevicePrivate *priv;
@ -15939,12 +15939,31 @@ sriov_deactivate_cb (GError *error, gpointer user_data)
nm_assert (priv->sriov_reset_pending > 0);
priv->sriov_reset_pending--;
if (nm_utils_error_is_cancelled_or_disposing (error))
if (nm_utils_error_is_cancelled (error))
return;
deactivate_ready (self, (NMDeviceStateReason) reason);
}
static void
sriov_reset_on_failure_cb (GError *error, gpointer user_data)
{
NMDevice *self = user_data;
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
nm_assert (priv->sriov_reset_pending > 0);
priv->sriov_reset_pending--;
if (nm_utils_error_is_cancelled (error))
return;
if (priv->state == NM_DEVICE_STATE_FAILED) {
nm_device_queue_state (self,
NM_DEVICE_STATE_DISCONNECTED,
NM_DEVICE_STATE_REASON_NONE);
}
}
static void
deactivate_async_ready (NMDevice *self,
GError *error,
@ -16275,7 +16294,7 @@ _set_state_full (NMDevice *self,
sriov_op_queue (self,
0,
NM_TERNARY_TRUE,
sriov_deactivate_cb,
sriov_reset_on_deactivate_cb,
nm_utils_user_data_pack (self, (gpointer) reason));
}
}
@ -16327,6 +16346,16 @@ _set_state_full (NMDevice *self,
if (sett_conn && !nm_settings_connection_get_timestamp (sett_conn, NULL))
nm_settings_connection_update_timestamp (sett_conn, (guint64) 0);
if ( priv->ifindex > 0
&& (s_sriov = nm_device_get_applied_setting (self, NM_TYPE_SETTING_SRIOV))) {
priv->sriov_reset_pending++;
sriov_op_queue (self,
0,
NM_TERNARY_TRUE,
sriov_reset_on_failure_cb,
self);
break;
}
/* Schedule the transition to DISCONNECTED. The device can't transition
* immediately because we can't change states again from the state
* handler for a variety of reasons.