aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2014-12-05 10:20:10 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2014-12-05 11:15:02 -0500
commit2331fd46f5452944f32a2bc78fa05026617887c6 (patch)
tree44a13a2b8c01e612d666d2f2808b838956238cde
parentfff71b14113030f490a8e9eace2e1a22dddfa284 (diff)
Bluetooth: Move LE advertising report defines to the right location
All Bluetooth commands and events are ordered by its opcode or event id, but for some reason this one now stands out. So move it to its correct spot in the list. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
-rw-r--r--include/net/bluetooth/hci.h38
1 files changed, 19 insertions, 19 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index b6f7be1eb919..edb55e54e039 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -1751,6 +1751,25 @@ struct hci_ev_le_conn_complete {
1751 __u8 clk_accurancy; 1751 __u8 clk_accurancy;
1752} __packed; 1752} __packed;
1753 1753
1754/* Advertising report event types */
1755#define LE_ADV_IND 0x00
1756#define LE_ADV_DIRECT_IND 0x01
1757#define LE_ADV_SCAN_IND 0x02
1758#define LE_ADV_NONCONN_IND 0x03
1759#define LE_ADV_SCAN_RSP 0x04
1760
1761#define ADDR_LE_DEV_PUBLIC 0x00
1762#define ADDR_LE_DEV_RANDOM 0x01
1763
1764#define HCI_EV_LE_ADVERTISING_REPORT 0x02
1765struct hci_ev_le_advertising_info {
1766 __u8 evt_type;
1767 __u8 bdaddr_type;
1768 bdaddr_t bdaddr;
1769 __u8 length;
1770 __u8 data[0];
1771} __packed;
1772
1754#define HCI_EV_LE_CONN_UPDATE_COMPLETE 0x03 1773#define HCI_EV_LE_CONN_UPDATE_COMPLETE 0x03
1755struct hci_ev_le_conn_update_complete { 1774struct hci_ev_le_conn_update_complete {
1756 __u8 status; 1775 __u8 status;
@@ -1776,25 +1795,6 @@ struct hci_ev_le_remote_conn_param_req {
1776 __le16 timeout; 1795 __le16 timeout;
1777} __packed; 1796} __packed;
1778 1797
1779/* Advertising report event types */
1780#define LE_ADV_IND 0x00
1781#define LE_ADV_DIRECT_IND 0x01
1782#define LE_ADV_SCAN_IND 0x02
1783#define LE_ADV_NONCONN_IND 0x03
1784#define LE_ADV_SCAN_RSP 0x04
1785
1786#define ADDR_LE_DEV_PUBLIC 0x00
1787#define ADDR_LE_DEV_RANDOM 0x01
1788
1789#define HCI_EV_LE_ADVERTISING_REPORT 0x02
1790struct hci_ev_le_advertising_info {
1791 __u8 evt_type;
1792 __u8 bdaddr_type;
1793 bdaddr_t bdaddr;
1794 __u8 length;
1795 __u8 data[0];
1796} __packed;
1797
1798/* Internal events generated by Bluetooth stack */ 1798/* Internal events generated by Bluetooth stack */
1799#define HCI_EV_STACK_INTERNAL 0xfd 1799#define HCI_EV_STACK_INTERNAL 0xfd
1800struct hci_ev_stack_internal { 1800struct hci_ev_stack_internal {