From 1ec50ced231197df4a54f6928703543c0f6f9c28 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Mon, 8 Dec 2014 15:37:25 +0200 Subject: [PATCH] core: Enable SC after LE & BR/EDR enabling/disabling Enabling of SC needs to happen after LE & BR/EDR changes are complete. E.g. on 4.0 controllers we must first enable LE before being able to enable SC. --- src/adapter.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index 7cab8605f..85036c417 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -6970,9 +6970,6 @@ static void read_info_complete(uint8_t status, uint16_t length, missing_settings = adapter->current_settings ^ adapter->supported_settings; - if (missing_settings & MGMT_SETTING_SECURE_CONN) - set_mode(adapter, MGMT_OP_SET_SECURE_CONN, 0x01); - switch (main_opts.mode) { case BT_MODE_DUAL: if (missing_settings & MGMT_SETTING_SSP) @@ -7008,6 +7005,9 @@ static void read_info_complete(uint8_t status, uint16_t length, break; } + if (missing_settings & MGMT_SETTING_SECURE_CONN) + set_mode(adapter, MGMT_OP_SET_SECURE_CONN, 0x01); + err = adapter_register(adapter); if (err < 0) { error("Unable to register new adapter"); -- 2.47.3