From: Johan Hedberg <johan.hedberg@intel.com>
Date: Tue, 21 Feb 2012 17:15:49 +0000 (+0200)
Subject: Bluetooth: mgmt: Fix Removing discoverable timeout in set_connectable
X-Git-Tag: upstream/snapshot3+hdmi~7954^2~112^2~97
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df2c6c5ed5c0bc13b78e855d3e5d9aa3472567ba;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Bluetooth: mgmt: Fix Removing discoverable timeout in set_connectable

When switching connectable mode off any pending discoverable timeout
must also be disabled to avoid duplicate write_scan_enable commands.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
---

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 6311be7..eec70a4 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -935,9 +935,14 @@ static int set_connectable(struct sock *sk, u16 index, void *data, u16 len)
 
 	if (cp->val)
 		scan = SCAN_PAGE;
-	else
+	else {
 		scan = 0;
 
+		if (test_bit(HCI_ISCAN, &hdev->flags) &&
+						hdev->discov_timeout > 0)
+			cancel_delayed_work(&hdev->discov_off);
+	}
+
 	err = hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);
 	if (err < 0)
 		mgmt_pending_remove(cmd);