This is a note to let you know that I've just added the patch titled
Bluetooth: Reuse hci_stop_discovery function when cleaning up HCI state
to the 3.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
bluetooth-reuse-hci_stop_discovery-function-when-cleaning-up-hci-state.patch
and it can be found in the queue-3.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From f8680f128b01212895a9afb31032f6ffe91bd771 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date: Tue, 10 Jun 2014 14:05:59 +0300
Subject: Bluetooth: Reuse hci_stop_discovery function when cleaning up HCI state
From: Johan Hedberg <johan.hedberg@xxxxxxxxx>
commit f8680f128b01212895a9afb31032f6ffe91bd771 upstream.
When cleaning up the HCI state as part of the power-off procedure we can
reuse the hci_stop_discovery() function instead of explicitly sending
HCI command related to discovery. The added benefit of this is that it
takes care of canceling name resolving and inquiry which were not
previously covered by the code.
Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/bluetooth/mgmt.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1098,9 +1098,7 @@ static int clean_up_hci_state(struct hci
if (test_bit(HCI_ADVERTISING, &hdev->dev_flags))
disable_advertising(&req);
- if (test_bit(HCI_LE_SCAN, &hdev->dev_flags)) {
- hci_req_add_le_scan_disable(&req);
- }
+ hci_stop_discovery(&req);
list_for_each_entry(conn, &hdev->conn_hash.list, list) {
struct hci_cp_disconnect dc;
Patches currently in stable-queue which might be from johan.hedberg@xxxxxxxxx are
queue-3.15/bluetooth-fix-locking-of-hdev-when-calling-into-smp-code.patch
queue-3.15/bluetooth-allow-change-security-level-on-att_cid-in-slave-role.patch
queue-3.15/bluetooth-refactor-discovery-stopping-into-its-own-function.patch
queue-3.15/bluetooth-reuse-hci_stop_discovery-function-when-cleaning-up-hci-state.patch
queue-3.15/bluetooth-fix-incorrectly-overriding-conn-src_type.patch
queue-3.15/bluetooth-fix-indicating-discovery-state-when-canceling-inquiry.patch
queue-3.15/bluetooth-fix-setting-correct-authentication-information-for-smp-stk.patch
queue-3.15/bluetooth-fix-ssp-acceptor-just-works-confirmation-without-mitm.patch
queue-3.15/bluetooth-fix-check-for-connection-encryption.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html