Bluetooth: Block incoming commands from mgmtops when hci device is down
Even after the device is down, some hci commands are getting queued in
some scenarios, since there is no command queue purge mechanism in the
initialization sequence, so the immediate device up initialization
sequence is messed up with unexpected commands.
The current change blocks some of the hci commands to get queued if the
device is down and also purges the queue in the beginning of the next
device initialization sequence.
CRs-fixed: 336160
Change-Id: Ice5a38da47af11babd5b9dd33b9d711ef96e6732
Signed-off-by: Bhasker Neti <bneti@codeaurora.org>
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 47bfde5..4c2bd37 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -561,6 +561,19 @@
goto done;
}
+ if (!skb_queue_empty(&hdev->cmd_q)) {
+ BT_ERR("command queue is not empty, purging");
+ skb_queue_purge(&hdev->cmd_q);
+ }
+ if (!skb_queue_empty(&hdev->rx_q)) {
+ BT_ERR("rx queue is not empty, purging");
+ skb_queue_purge(&hdev->rx_q);
+ }
+ if (!skb_queue_empty(&hdev->raw_q)) {
+ BT_ERR("raw queue is not empty, purging");
+ skb_queue_purge(&hdev->raw_q);
+ }
+
if (!test_bit(HCI_RAW, &hdev->flags)) {
atomic_set(&hdev->cmd_cnt, 1);
set_bit(HCI_INIT, &hdev->flags);