summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorSudha Bheemanna <b.sudha@samsung.com>2016-09-08 17:01:39 +0530
committerSeung-Woo Kim <sw0312.kim@samsung.com>2016-12-14 13:53:20 +0900
commit28025ce1248c67e457024bbf9454939365a461bc (patch)
tree6db247207fed27ad25c562c351b98e1d21ecb4b4 /net
parent4740d1bfd7a7784a57eb96a3b8530ef8ea3afd7f (diff)
Bluetooth: Cancel the Sniff timer
This patch adds code to cancel the sniff timer. Change-Id: I756d3b08acf6462044d1fb204064fe12ce1238c1 Signed-off-by: Sudha Bheemanna <b.sudha@samsung.com>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_conn.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 440ae7d6c653..93a97c1d99d5 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -1195,9 +1195,18 @@ void hci_conn_enter_active_mode(struct hci_conn *conn, __u8 force_active)
}
timer:
+#ifdef TIZEN_BT
+ if (hdev->idle_timeout > 0) {
+ /* Sniff timer cancel */
+ cancel_delayed_work(&conn->idle_work);
+ queue_delayed_work(hdev->workqueue, &conn->idle_work,
+ msecs_to_jiffies(hdev->idle_timeout));
+ }
+#else
if (hdev->idle_timeout > 0)
queue_delayed_work(hdev->workqueue, &conn->idle_work,
msecs_to_jiffies(hdev->idle_timeout));
+#endif
}
/* Drop all connection on the device */