From 54a7a2f4e5a5cae1bef9f8edbcb4650e3d835c9f Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Tue, 23 Sep 2008 09:33:04 -0700 Subject: Fix OffMode = DevDown race condition. --- src/adapter.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/adapter.c') diff --git a/src/adapter.c b/src/adapter.c index a59f2b12..4a6ea8c2 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -2242,9 +2242,14 @@ static void adapter_up(struct btd_adapter *adapter, int dd) /* Set scan mode */ if (read_device_mode(srcaddr, mode, sizeof(mode)) == 0) { - if (!strcmp(mode, "off") && main_opts.offmode == HCID_OFFMODE_NOSCAN) { - adapter->mode = MODE_OFF; - adapter->scan_mode= SCAN_DISABLED; + if (!strcmp(mode, "off")) { + if (main_opts.offmode == HCID_OFFMODE_NOSCAN) { + adapter->mode = MODE_OFF; + adapter->scan_mode= SCAN_DISABLED; + } else if (main_opts.offmode == HCID_OFFMODE_DEVDOWN) { + ioctl(dd, HCIDEVDOWN, adapter->dev_id); + return; + } } else if (!strcmp(mode, "connectable")) { adapter->mode = MODE_CONNECTABLE; adapter->scan_mode = SCAN_PAGE; -- cgit