summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorAndre Guedes <andre.guedes@openbossa.org>2013-03-08 15:20:16 +0100
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-03-09 21:10:47 +0100
commit5d73e0342fd9bf500583868906325d42c4d2bf6f (patch)
treebc438120341f687ff2cd9d6337f59459b1afd6a8 /include/net
parentBluetooth: Check hci_req_run returning value in __hci_req_sync (diff)
downloadlinux-5d73e0342fd9bf500583868906325d42c4d2bf6f.tar.xz
linux-5d73e0342fd9bf500583868906325d42c4d2bf6f.zip
Bluetooth: HCI request error handling
When we are building a HCI request with more than one HCI command and one of the hci_req_add calls fail, we should have some cleanup routine so the HCI commands already queued on HCI request can be deleted. Otherwise, we will face some memory leaks issues. This patch implements the HCI request error handling which is the following: If a hci_req_add fails, we save the error code in hci_ request. Once hci_req_run is called, we verify the error field. If it is different from zero, we delete all HCI commands already queued and return the error code. Signed-off-by: Andre Guedes <andre.guedes@openbossa.org> Acked-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/bluetooth/hci_core.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 3a9cbf2b55c0..332ee5099a52 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1042,6 +1042,11 @@ int hci_unregister_cb(struct hci_cb *hcb);
struct hci_request {
struct hci_dev *hdev;
struct sk_buff_head cmd_q;
+
+ /* If something goes wrong when building the HCI request, the error
+ * value is stored in this field.
+ */
+ int err;
};
void hci_req_init(struct hci_request *req, struct hci_dev *hdev);