Bluetooth: HCI request error handling

[mirror_ubuntu-artful-kernel.git] / include / net / bluetooth / hci_core.h

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 3f124f43fcb179ef7f454a57ec634581ef659261..332ee5099a52ad0104caa4b015dfad0140c959ef 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -248,8 +248,6 @@ struct hci_dev {
        __u32                   req_status;
        __u32                   req_result;
 
-       __u16                   init_last_cmd;
-
        struct list_head        mgmt_pending;
 
        struct discovery_state  discovery;
@@ -1044,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);