summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/adapter.c8
-rw-r--r--src/adapter.h1
-rw-r--r--src/dbus-hci.c2
3 files changed, 10 insertions, 1 deletions
diff --git a/src/adapter.c b/src/adapter.c
index fbbf3ea9..30ace0bd 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -3032,6 +3032,14 @@ struct bonding_request_info *adapter_get_bonding_info(struct adapter *adapter)
return adapter->bonding;
}
+gboolean adapter_has_discov_sessions(struct adapter *adapter)
+{
+ if (!adapter || !adapter->disc_sessions)
+ return FALSE;
+
+ return TRUE;
+}
+
int btd_register_adapter_driver(struct btd_adapter_driver *driver)
{
adapter_drivers = g_slist_append(adapter_drivers, driver);
diff --git a/src/adapter.h b/src/adapter.h
index e41911e5..2fe1836b 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -185,6 +185,7 @@ struct active_conn_info *adapter_search_active_conn_by_handle(struct adapter *ad
uint16_t handle);
void adapter_free_bonding_request(struct adapter *adapter);
struct bonding_request_info *adapter_get_bonding_info(struct adapter *adapter);
+gboolean adapter_has_discov_sessions(struct adapter *adapter);
struct btd_adapter_driver {
const char *name;
diff --git a/src/dbus-hci.c b/src/dbus-hci.c
index 4cd2d619..9c667e7f 100644
--- a/src/dbus-hci.c
+++ b/src/dbus-hci.c
@@ -620,7 +620,7 @@ void hcid_dbus_inquiry_start(bdaddr_t *local)
pending_remote_name_cancel(adapter);
/* Disable name resolution for non D-Bus clients */
- if (!adapter->disc_sessions) {
+ if (!adapter_has_discov_sessions(adapter)) {
state = adapter_get_state(adapter);
state &= ~RESOLVE_NAME;
adapter_set_state(adapter, state);