From: Johan Hedberg Date: Fri, 15 Mar 2013 22:07:10 +0000 (-0500) Subject: Bluetooth: Disable fast connectable when disabling connectable X-Git-Tag: v3.12-rc1~804^2~21^2^2~234^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e36a37691e53b54edb78209757fab0dd76c4614f;p=kernel%2Fkernel-generic.git Bluetooth: Disable fast connectable when disabling connectable When the connectable setting is disabled the fast connectable setting must also be disabled. This is so that we're consistent with the pre-requisites for enabling fast connectable, one of which is that the connectable setting is enabled. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Signed-off-by: Gustavo Padovan --- diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index f03b10c..98f6295 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -1119,6 +1119,9 @@ static int set_connectable(struct sock *sk, struct hci_dev *hdev, void *data, hci_req_add(&req, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan); + if (!cp->val && test_bit(HCI_FAST_CONNECTABLE, &hdev->dev_flags)) + write_fast_connectable(&req, false); + err = hci_req_run(&req, set_connectable_complete); if (err < 0) mgmt_pending_remove(cmd);