From: Johan Hedberg <johan.hedberg@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH v2 07/11] Bluetooth: Introduce a hci_req_from_skb function
Date: Tue, 5 Mar 2013 10:29:06 +0200 [thread overview]
Message-ID: <1362472150-30965-8-git-send-email-johan.hedberg@gmail.com> (raw)
In-Reply-To: <1362472150-30965-1-git-send-email-johan.hedberg@gmail.com>
From: Johan Hedberg <johan.hedberg@intel.com>
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. This patch introduces a new
function to create a single-command request and converts the two places
needing this (hci_send_cmd and hci_sock_sendmsg) to use it.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
include/net/bluetooth/hci_core.h | 1 +
net/bluetooth/hci_core.c | 10 ++++++++--
net/bluetooth/hci_sock.c | 3 +--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 67fe661..a5a865d 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1049,6 +1049,7 @@ struct hci_request {
void hci_req_init(struct hci_request *req, struct hci_dev *hdev);
int hci_req_run(struct hci_request *req, hci_req_complete_t complete);
int hci_req_add(struct hci_request *req, u16 opcode, u32 plen, void *param);
+void hci_req_from_skb(struct hci_dev *hdev, struct sk_buff *skb);
int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param);
void hci_send_acl(struct hci_chan *chan, struct sk_buff *skb, __u16 flags);
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 0f2a0bf..382642d 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2469,6 +2469,13 @@ int hci_req_run(struct hci_request *req, hci_req_complete_t complete)
return 0;
}
+void hci_req_from_skb(struct hci_dev *hdev, struct sk_buff *skb)
+{
+ bt_cb(skb)->req.start = true;
+ skb_queue_tail(&hdev->cmd_q, skb);
+ queue_work(hdev->workqueue, &hdev->cmd_work);
+}
+
static struct sk_buff *hci_prepare_cmd(struct hci_dev *hdev, u16 opcode,
u32 plen, void *param)
{
@@ -2511,8 +2518,7 @@ 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;
- skb_queue_tail(&hdev->cmd_q, skb);
- queue_work(hdev->workqueue, &hdev->cmd_work);
+ hci_req_from_skb(hdev, skb);
return 0;
}
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 20c92de..18cb4f3 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -859,8 +859,7 @@ 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 {
- skb_queue_tail(&hdev->cmd_q, skb);
- queue_work(hdev->workqueue, &hdev->cmd_work);
+ hci_req_from_skb(hdev, skb);
}
} else {
if (!capable(CAP_NET_RAW)) {
--
1.7.10.4
next prev parent reply other threads:[~2013-03-05 8:29 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-05 8:28 [PATCH v2 00/11] Bluetooth: Add asynchronous request support Johan Hedberg
2013-03-05 8:29 ` [PATCH v2 01/11] Bluetooth: Rename hci_request to hci_req_sync Johan Hedberg
2013-03-05 8:29 ` [PATCH v2 02/11] Bluetooth: Fix __hci_request() handling of empty requests Johan Hedberg
2013-03-05 8:29 ` [PATCH v2 03/11] Bluetooth: Split HCI init sequence into three stages Johan Hedberg
2013-03-05 17:01 ` Marcel Holtmann
2013-03-05 8:29 ` [PATCH v2 04/11] Bluetooth: Add initial skeleton for asynchronous HCI requests Johan Hedberg
2013-03-05 8:29 ` [PATCH v2 05/11] Bluetooth: Refactor HCI command skb creation Johan Hedberg
2013-03-05 8:29 ` [PATCH v2 06/11] Bluetooth: Introduce new hci_req_add function Johan Hedberg
2013-03-05 8:29 ` Johan Hedberg [this message]
2013-03-05 17:04 ` [PATCH v2 07/11] Bluetooth: Introduce a hci_req_from_skb function Marcel Holtmann
2013-03-05 8:29 ` [PATCH v2 08/11] Bluetooth: Add request cmd_complete and cmd_status functions Johan Hedberg
2013-03-05 8:29 ` [PATCH v2 09/11] Bluetooth: Use async requests internally in hci_req_sync Johan Hedberg
2013-03-05 17:08 ` Marcel Holtmann
2013-03-05 8:29 ` [PATCH v2 10/11] Bluetooth: Remove unused hdev->init_last_cmd Johan Hedberg
2013-03-05 8:29 ` [PATCH v2 11/11] Bluetooth: Remove empty HCI event handlers Johan Hedberg
2013-03-05 17:10 ` Marcel Holtmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1362472150-30965-8-git-send-email-johan.hedberg@gmail.com \
--to=johan.hedberg@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox