From 39e365733bd3c79c5801d4e6c7a32f133b9af678 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 6 Jul 2020 17:30:05 +0200 Subject: [PATCH] core: fix check on master active-connection failure The previous check was never satisfied, as the device is assigned to the active-connection and realized early. Instead, check the master_ready flag, which tells if the master is ready and, therefore, if the slave has already been added to the master. Before this commit, in some cases a device didn't detect that the master failed and kept waiting forever. https://bugzilla.redhat.com/show_bug.cgi?id=1845018 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/568 (cherry picked from commit 0911d2a4ee1c317f455c01cbad048b994f69844d) (cherry picked from commit 223f741810db9e457ec512c7626bf9e65d82a6cb) --- src/nm-active-connection.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c index 08037ebe71..151fb4d939 100644 --- a/src/nm-active-connection.c +++ b/src/nm-active-connection.c @@ -810,14 +810,14 @@ master_state_cb (NMActiveConnection *master, gpointer user_data) { NMActiveConnection *self = NM_ACTIVE_CONNECTION (user_data); + NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (self); NMActiveConnectionState master_state = nm_active_connection_get_state (master); - NMDevice *master_device = nm_active_connection_get_device (master); check_master_ready (self); if ( master_state == NM_ACTIVE_CONNECTION_STATE_DEACTIVATING - && (!master_device || !nm_device_is_real (master_device))) { - /* Master failed without ever creating or realizing its device */ + && !priv->master_ready) { + /* Master disconnected before the slave was added */ if (NM_ACTIVE_CONNECTION_GET_CLASS (self)->master_failed) NM_ACTIVE_CONNECTION_GET_CLASS (self)->master_failed (self); } -- 2.26.2