diff options
| author | Kalle Valo <kvalo@qca.qualcomm.com> | 2014-07-24 20:06:37 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2014-07-24 20:06:37 +0300 |
| commit | 30d88ce331d566f496fe7bea25ee560dcfd253ae (patch) | |
| tree | a1dfe71a00fad0fa20693c350557609f8ecf9d36 /include/net/bluetooth/hci.h | |
| parent | c29a380e4a8157f8bf6a91c216a77439a293c93d (diff) | |
| parent | bac9832076ee3b134bc859e07698c99276fc9459 (diff) | |
Merge remote-tracking branch 'wireless-next/master' into ath-next
Diffstat (limited to 'include/net/bluetooth/hci.h')
| -rw-r--r-- | include/net/bluetooth/hci.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 2fee852816ee..f0a3d8890760 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -401,6 +401,9 @@ enum { /* The core spec defines 127 as the "not available" value */ #define HCI_TX_POWER_INVALID 127 +#define HCI_ROLE_MASTER 0x00 +#define HCI_ROLE_SLAVE 0x01 + /* Extended Inquiry Response field types */ #define EIR_FLAGS 0x01 /* flags */ #define EIR_UUID16_SOME 0x02 /* 16-bit UUID, more available */ @@ -1713,9 +1716,6 @@ struct hci_ev_sync_train_complete { #define HCI_EV_SLAVE_PAGE_RESP_TIMEOUT 0x54 -/* Low energy meta events */ -#define LE_CONN_ROLE_MASTER 0x00 - #define HCI_EV_LE_CONN_COMPLETE 0x01 struct hci_ev_le_conn_complete { __u8 status; |