merge: branch 'sriov_opt'

sriov: do not fail activation on SR-IOV VF failures

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1682
This commit is contained in:
Gris Ge
2023-06-29 10:07:14 +00:00

View File

@@ -9590,11 +9590,7 @@ sriov_params_cb(GError *error, gpointer user_data)
if (!nm_platform_link_set_sriov_vfs(nm_device_get_platform(self), if (!nm_platform_link_set_sriov_vfs(nm_device_get_platform(self),
priv->ifindex, priv->ifindex,
(const NMPlatformVF *const *) plat_vfs)) { (const NMPlatformVF *const *) plat_vfs)) {
_LOGE(LOGD_DEVICE, "failed to apply SR-IOV VFs"); _LOGW(LOGD_DEVICE, "failed to apply SR-IOV VF configurations");
nm_device_state_changed(self,
NM_DEVICE_STATE_FAILED,
NM_DEVICE_STATE_REASON_SRIOV_CONFIGURATION_FAILED);
return;
} }
priv->stage1_sriov_state = NM_DEVICE_STAGE_STATE_COMPLETED; priv->stage1_sriov_state = NM_DEVICE_STAGE_STATE_COMPLETED;