From 3f669444ce22b10e9e3b37428bbef403fde09785 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 17 Feb 2016 12:05:45 +0100 Subject: [PATCH] manager: don't proceed with activation when there's no master device Since the device-for-all merge it's a sin (trips an assert) to create an activation request with NULL device. If we get here, it's probably that the master device exists, but is not ready for activation (it's in UNMANAGED state in the process of being created). --- src/nm-manager.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index 589fc10f68..648faf4df0 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -2564,21 +2564,6 @@ ensure_master_active_connection (NMManager *self, return master_ac; } - /* Device described by master_connection may be a virtual one that's - * not created yet. - */ - if (!found_device && nm_connection_is_virtual (NM_CONNECTION (master_connection))) { - master_ac = nm_manager_activate_connection (self, - master_connection, - NULL, - NULL, - subject, - error); - if (!master_ac) - g_prefix_error (error, "%s", "Master device activation failed: "); - return master_ac; - } - g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_DEVICE,