From 8b18c613abeea6590dfba72f99971d969b8201cd Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 13 Jan 2016 17:21:31 +0100 Subject: [PATCH] manager: don't reject all internal activations on non-autoconnectable devices When there's a slave that allows autoconnection and an unrealized master this would cause the master activation to fail. For the actual auto-activations the proper check is already done in NMPolicy's auto_activate_device(). --- src/nm-manager.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index 338b3cd68a..dbaf54c781 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -2736,17 +2736,6 @@ _internal_activate_device (NMManager *self, NMActiveConnection *active, GError * return FALSE; } - /* If this is an autoconnect request, but the device isn't allowing autoconnect - * right now, we reject it. - */ - if (!nm_active_connection_get_user_requested (active) && - !nm_device_autoconnect_allowed (device)) { - g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_CONNECTION_NOT_AVAILABLE, - "%s does not allow automatic connections at this time", - nm_device_get_iface (device)); - return FALSE; - } - /* Create any backing resources the device needs */ if (!nm_device_is_real (device)) { NMDevice *parent;