[PATCH v5 07/15] adapter: Read discoverable timeout in storage at init
STALE5099d
From: Frédéric Danis <hidden>
Date: 2012-10-18 09:00:50
Subsystem:
the rest · Maintainer:
Linus Torvalds
--- src/adapter.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index 6d2aadc..20fa1d0 100644
--- a/src/adapter.c
+++ b/src/adapter.c@@ -2107,16 +2107,6 @@ static void load_connections(struct btd_adapter *adapter) g_slist_free_full(conns, g_free); } -static int get_discoverable_timeout(const char *src) -{ - int timeout; - - if (read_discoverable_timeout(src, &timeout) == 0) - return timeout; - - return main_opts.discovto; -} - static void set_auto_connect(gpointer data, gpointer user_data) { struct btd_device *device = data;
@@ -2161,7 +2151,7 @@ void btd_adapter_get_mode(struct btd_adapter *adapter, uint8_t *mode, *on_mode = get_mode(&adapter->bdaddr, "on"); if (discoverable_timeout) - *discoverable_timeout = get_discoverable_timeout(address); + *discoverable_timeout = adapter->discov_timeout; if (pairable) *pairable = adapter->pairable;
@@ -2242,7 +2232,6 @@ void btd_adapter_start(struct btd_adapter *adapter) adapter->off_requested = FALSE; adapter->up = TRUE; - adapter->discov_timeout = get_discoverable_timeout(address); adapter->off_timer = 0; if (adapter->scan_mode & SCAN_INQUIRY)
@@ -2518,6 +2507,12 @@ static void load_config(struct btd_adapter *adapter) adapter->pairable_timeout = main_opts.pairto; else adapter->pairable_timeout = timeout; + + /* Get discoverable timeout */ + if (read_discoverable_timeout(address, &timeout) < 0) + adapter->discov_timeout = main_opts.discovto; + else + adapter->discov_timeout = timeout; } gboolean adapter_init(struct btd_adapter *adapter, gboolean up)
--
1.7.9.5