diff options
| author | Andrei Emeltchenko | 2011-11-07 13:20:25 +0100 |
|---|---|---|
| committer | Gustavo F. Padovan | 2011-11-08 15:53:11 +0100 |
| commit | 9f5a0d7bf079e9e26771ad13ff1c2cb3adf80963 (patch) | |
| tree | e82724f7e47c226831c757b2b78c8bef98653d50 /include | |
| parent | Bluetooth: Clean up logic in hci_cc_write_scan_enable (diff) | |
| download | kernel-qcow2-linux-9f5a0d7bf079e9e26771ad13ff1c2cb3adf80963.tar.gz kernel-qcow2-linux-9f5a0d7bf079e9e26771ad13ff1c2cb3adf80963.tar.xz kernel-qcow2-linux-9f5a0d7bf079e9e26771ad13ff1c2cb3adf80963.zip | |
Bluetooth: Define HCI reasons instead of magic number
Use HCI error reasons instead of magic numbers.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bluetooth/hci.h | 7 | ||||
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index c5fcd13b9edf..139ce2aa6eee 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -264,6 +264,13 @@ enum { #define HCI_LK_SMP_IRK 0x82 #define HCI_LK_SMP_CSRK 0x83 +/* ---- HCI Error Codes ---- */ +#define HCI_ERROR_AUTH_FAILURE 0x05 +#define HCI_ERROR_REJ_BAD_ADDR 0x0f +#define HCI_ERROR_REMOTE_USER_TERM 0x13 +#define HCI_ERROR_LOCAL_HOST_TERM 0x16 +#define HCI_ERROR_PAIRING_NOT_ALLOWED 0x18 + /* ----- HCI Commands ---- */ #define HCI_OP_NOP 0x0000 diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index f97792c972f3..006a7699abac 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -730,7 +730,7 @@ static inline void hci_proto_connect_cfm(struct hci_conn *conn, __u8 status) static inline int hci_proto_disconn_ind(struct hci_conn *conn) { register struct hci_proto *hp; - int reason = 0x13; + int reason = HCI_ERROR_REMOTE_USER_TERM; hp = hci_proto[HCI_PROTO_L2CAP]; if (hp && hp->disconn_ind) |