diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2014-09-08 20:09:49 -0400 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-09-08 21:12:15 -0400 |
| commit | e1e930f591bfd9604c3077f0af5c390f4f890259 (patch) | |
| tree | 6a336f7ddb09a2e53150907656207088afb24b0e /include/net/bluetooth | |
| parent | c68b7f127d5f517c214e8bcf231d0188f6776d2a (diff) | |
Bluetooth: Fix mgmt pairing failure when authentication fails
Whether through HCI with BR/EDR or SMP with LE when authentication fails
we should also notify any pending Pair Device mgmt command. This patch
updates the mgmt_auth_failed function to take the actual hci_conn object
and makes sure that any pending pairing command is notified and cleaned
up appropriately.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'include/net/bluetooth')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 045d9133d180..206b92bfeebb 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
| @@ -1342,8 +1342,7 @@ int mgmt_user_passkey_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, | |||
| 1342 | int mgmt_user_passkey_notify(struct hci_dev *hdev, bdaddr_t *bdaddr, | 1342 | int mgmt_user_passkey_notify(struct hci_dev *hdev, bdaddr_t *bdaddr, |
| 1343 | u8 link_type, u8 addr_type, u32 passkey, | 1343 | u8 link_type, u8 addr_type, u32 passkey, |
| 1344 | u8 entered); | 1344 | u8 entered); |
| 1345 | void mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, | 1345 | void mgmt_auth_failed(struct hci_conn *conn, u8 status); |
| 1346 | u8 addr_type, u8 status); | ||
| 1347 | void mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status); | 1346 | void mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status); |
| 1348 | void mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status); | 1347 | void mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status); |
| 1349 | void mgmt_sc_enable_complete(struct hci_dev *hdev, u8 enable, u8 status); | 1348 | void mgmt_sc_enable_complete(struct hci_dev *hdev, u8 enable, u8 status); |
