From cdc1f47499a5344692d81ef48faa4519769d8b4b Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 5 Jan 2013 00:02:41 -0800 Subject: [PATCH] core: Use adapter settings directly to determine if SSP is enabled --- src/adapter.c | 7 +++++-- src/adapter.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index 3c9421330..8f7446559 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -3960,9 +3960,12 @@ int btd_adapter_remove_remote_oob_data(struct btd_adapter *adapter, return mgmt_remove_remote_oob_data(adapter->dev_id, bdaddr); } -int btd_adapter_ssp_enabled(struct btd_adapter *adapter) +bool btd_adapter_ssp_enabled(struct btd_adapter *adapter) { - return mgmt_ssp_enabled(adapter->dev_id); + if (adapter->current_settings & MGMT_SETTING_SSP) + return true; + + return false; } void btd_adapter_set_oob_handler(struct btd_adapter *adapter, diff --git a/src/adapter.h b/src/adapter.h index 558e14966..ecafddc9e 100644 --- a/src/adapter.h +++ b/src/adapter.h @@ -205,7 +205,7 @@ int btd_adapter_remove_remote_oob_data(struct btd_adapter *adapter, int btd_adapter_gatt_server_start(struct btd_adapter *adapter); void btd_adapter_gatt_server_stop(struct btd_adapter *adapter); -int btd_adapter_ssp_enabled(struct btd_adapter *adapter); +bool btd_adapter_ssp_enabled(struct btd_adapter *adapter); void adapter_connect_list_add(struct btd_adapter *adapter, struct btd_device *device); -- 2.47.3