2011-04-12 15:43:41

by Justin P. Mattock

Subject: [PATCH] Bluetooth: Fix HCI_RESET command synchronization backported to stable

backported to stable. did not have the time to compile test this, but patch applies.

Reported-by: Mikko Vinni <[email protected]>
Reported-by: Justin P. Mattock <[email protected]>
Reported-by: Ed Tomlinson <[email protected]>
Signed-off-by: Gustavo F. Padovan <[email protected]>
Tested-by: Justin P. Mattock <[email protected]>
Tested-by: Mikko Vinni <[email protected]>
Tested-by: Ed Tomlinson <[email protected]>


diff -Naur linux-2.6.38.2-orig/include/net/bluetooth/hci.h linux-2.6.38.2/include/net/bluetooth/hci.h
--- linux-2.6.38.2-orig/include/net/bluetooth/hci.h 2011-03-27 11:37:20.000000000 -0700
+++ linux-2.6.38.2/include/net/bluetooth/hci.h 2011-04-12 08:27:55.905603867 -0700
@@ -74,6 +74,7 @@
HCI_AUTH,
HCI_ENCRYPT,
HCI_INQUIRY,
+ HCI_RESET,

HCI_RAW,
};
diff -Naur linux-2.6.38.2-orig/net/bluetooth/hci_core.c linux-2.6.38.2/net/bluetooth/hci_core.c
--- linux-2.6.38.2-orig/net/bluetooth/hci_core.c 2011-03-27 11:37:20.000000000 -0700
+++ linux-2.6.38.2/net/bluetooth/hci_core.c 2011-04-12 08:29:40.178300280 -0700
@@ -184,6 +184,7 @@
BT_DBG("%s %ld", hdev->name, opt);

/* Reset device */
+ set_bit(HCI_RESET, &hdev->flags);
hci_send_cmd(hdev, HCI_OP_RESET, 0, NULL);
}

@@ -210,7 +211,8 @@
/* Mandatory initialization */

/* Reset */
- if (!test_bit(HCI_QUIRK_NO_RESET, &hdev->quirks))
+ if (!test_bit(HCI_QUIRK_NO_RESET, &hdev->quirks)) {
+ set_bit(HCI_RESET, &hdev->flags);
hci_send_cmd(hdev, HCI_OP_RESET, 0, NULL);

/* Read Local Supported Features */
diff -Naur linux-2.6.38.2-orig/net/bluetooth/hci_event.c linux-2.6.38.2/net/bluetooth/hci_event.c
--- linux-2.6.38.2-orig/net/bluetooth/hci_event.c 2011-03-27 11:37:20.000000000 -0700
+++ linux-2.6.38.2/net/bluetooth/hci_event.c 2011-04-12 08:30:54.816367176 -0700
@@ -183,6 +183,8 @@

BT_DBG("%s status 0x%x", hdev->name, status);

+ clear_bit(HCI_RESET, &hdev->flags);
+
hci_req_complete(hdev, HCI_OP_RESET, status);
}

@@ -1398,7 +1400,7 @@
break;
}

- if (ev->ncmd) {
+ if (ev->ncmd && !test_bit(HCI_RESET, &hdev->flags)) {
atomic_set(&hdev->cmd_cnt, 1);
if (!skb_queue_empty(&hdev->cmd_q))
tasklet_schedule(&hdev->cmd_task);

2011-04-14 23:41:37

by Greg KH

Subject: Re: [stable] [PATCH] Bluetooth: Fix HCI_RESET command synchronization backported to stable

On Tue, Apr 12, 2011 at 08:43:27AM -0700, Justin P. Mattock wrote:
> backported to stable. did not have the time to compile test this, but patch applies.

It applies, but breaks the build.

Care to do this correctly so I can apply it?

thanks,

greg k-h