From 816adbe89cb7770860d145197ca63d5fd12dbac9 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 2 Nov 2017 18:44:11 +0100 Subject: [PATCH] device/olpc-mesh: reject autoconnect requests early via get_autoconnect_allowed() OLPC devices cannot autoconnect, according to can_auto_connect(). We should instead reject any attempt to autoconnect earlier, via get_autoconnect_allowed(). (cherry picked from commit 7074b88a6a3f61066e42b3f136ac0c0f6e189b0c) --- src/devices/wifi/nm-device-olpc-mesh.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c index 18b82d53e7..3a4a027afa 100644 --- a/src/devices/wifi/nm-device-olpc-mesh.c +++ b/src/devices/wifi/nm-device-olpc-mesh.c @@ -107,11 +107,8 @@ check_connection_compatible (NMDevice *device, NMConnection *connection) } static gboolean -can_auto_connect (NMDevice *device, - NMConnection *connection, - char **specific_object) +get_autoconnect_allowed (NMDevice *device) { - nm_assert (!specific_object || !*specific_object); return FALSE; } @@ -516,7 +513,7 @@ nm_device_olpc_mesh_class_init (NMDeviceOlpcMeshClass *klass) object_class->dispose = dispose; parent_class->check_connection_compatible = check_connection_compatible; - parent_class->can_auto_connect = can_auto_connect; + parent_class->get_autoconnect_allowed = get_autoconnect_allowed; parent_class->complete_connection = complete_connection; parent_class->is_available = is_available; parent_class->act_stage1_prepare = act_stage1_prepare;