Bluetooth: Move LE advertising report defines to the right location
authorMarcel Holtmann <marcel@holtmann.org>
Fri, 5 Dec 2014 15:20:10 +0000 (16:20 +0100)
committerJohan Hedberg <johan.hedberg@intel.com>
Fri, 5 Dec 2014 16:15:02 +0000 (18:15 +0200)
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>
include/net/bluetooth/hci.h

index b6f7be1..edb55e5 100644 (file)
@@ -1751,6 +1751,25 @@ struct hci_ev_le_conn_complete {
        __u8     clk_accurancy;
 } __packed;
 
+/* Advertising report event types */
+#define LE_ADV_IND             0x00
+#define LE_ADV_DIRECT_IND      0x01
+#define LE_ADV_SCAN_IND                0x02
+#define LE_ADV_NONCONN_IND     0x03
+#define LE_ADV_SCAN_RSP                0x04
+
+#define ADDR_LE_DEV_PUBLIC     0x00
+#define ADDR_LE_DEV_RANDOM     0x01
+
+#define HCI_EV_LE_ADVERTISING_REPORT   0x02
+struct hci_ev_le_advertising_info {
+       __u8     evt_type;
+       __u8     bdaddr_type;
+       bdaddr_t bdaddr;
+       __u8     length;
+       __u8     data[0];
+} __packed;
+
 #define HCI_EV_LE_CONN_UPDATE_COMPLETE 0x03
 struct hci_ev_le_conn_update_complete {
        __u8     status;
@@ -1776,25 +1795,6 @@ struct hci_ev_le_remote_conn_param_req {
        __le16 timeout;
 } __packed;
 
-/* Advertising report event types */
-#define LE_ADV_IND             0x00
-#define LE_ADV_DIRECT_IND      0x01
-#define LE_ADV_SCAN_IND                0x02
-#define LE_ADV_NONCONN_IND     0x03
-#define LE_ADV_SCAN_RSP                0x04
-
-#define ADDR_LE_DEV_PUBLIC     0x00
-#define ADDR_LE_DEV_RANDOM     0x01
-
-#define HCI_EV_LE_ADVERTISING_REPORT   0x02
-struct hci_ev_le_advertising_info {
-       __u8     evt_type;
-       __u8     bdaddr_type;
-       bdaddr_t bdaddr;
-       __u8     length;
-       __u8     data[0];
-} __packed;
-
 /* Internal events generated by Bluetooth stack */
 #define HCI_EV_STACK_INTERNAL  0xfd
 struct hci_ev_stack_internal {