Thread (6 messages) flat view 6 messages, 2 authors, 2011-03-30
STALE5608d

[PATCH 1/2] Improve the logic when emitting Discovering signal

From: Claudio Takahasi <hidden>
Date: 2011-03-29 19:26:29
Subsystem: the rest · Maintainer: Linus Torvalds

---
 src/adapter.c |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index 031e141..69fd5be 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2826,19 +2826,18 @@ void adapter_set_state(struct btd_adapter *adapter, int state)
 			return;
 		break;
 	case STATE_LE_SCAN:
-		/* Scanning enabled */
-		if (adapter->disc_sessions) {
-			adapter->stop_discov_id = g_timeout_add(5120,
-								stop_scanning,
-								adapter);
+		discov_active = TRUE;
 
-			/* For dual mode: don't send "Discovering = TRUE"  */
-			if (bredr_capable(adapter) == TRUE)
-				return;
-		}
+		if (!adapter->disc_sessions)
+			break;
 
-		/* LE only */
-		discov_active = TRUE;
+		/* Scanning enabled */
+		adapter->stop_discov_id = g_timeout_add(5120, stop_scanning,
+							adapter);
+
+		/* For dual mode: don't send "Discovering = TRUE"  */
+		if (bredr_capable(adapter) == TRUE)
+			return;
 
 		break;
 	case STATE_IDLE:
-- 
1.7.4.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help