Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11714b3d authored Mar 05, 2013 by Johan Hedberg Committed by Gustavo Padovan Mar 08, 2013

Bluetooth: Fix stand-alone HCI command handling



To have a consistent content for hdev->cmd_q all entries need to follow
the semantics of asynchronous HCI requests. This means that even single
commands need to be dressed as requests by having a request start
indicator. This patch adds these indicators to the two places needing
it (hci_send_cmd and hci_sock_sendmsg).

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

parent 71c76a17

net/bluetooth/hci_core.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -2511,6 +2511,11 @@ int hci_send_cmd(struct hci_dev hdev, __u16 opcode, __u32 plen, void param)
		if (test_bit(HCI_INIT, &hdev->flags))
		hdev->init_last_cmd = opcode;

		/* Stand-alone HCI commands must be flaged as
		* single-command requests.
		*/
		bt_cb(skb)->req.start = true;

		skb_queue_tail(&hdev->cmd_q, skb);
		queue_work(hdev->workqueue, &hdev->cmd_work);

net/bluetooth/hci_sock.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -854,6 +854,11 @@ static int hci_sock_sendmsg(struct kiocb iocb, struct socket sock,
		skb_queue_tail(&hdev->raw_q, skb);
		queue_work(hdev->workqueue, &hdev->tx_work);
		} else {
		/* Stand-alone HCI commands must be flaged as
		* single-command requests.
		*/
		bt_cb(skb)->req.start = true;

		skb_queue_tail(&hdev->cmd_q, skb);
		queue_work(hdev->workqueue, &hdev->cmd_work);
		}