1 files changed, 59 insertions, 17 deletions

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 00596e816b4d..344b0f972828 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -77,14 +77,6 @@ enum {
 
         HCI_RAW,
 
-        HCI_SETUP,
-        HCI_AUTO_OFF,
-        HCI_MGMT,
-        HCI_PAIRABLE,
-        HCI_SERVICE_CACHE,
-        HCI_LINK_KEYS,
-        HCI_DEBUG_KEYS,
-
         HCI_RESET,
 };
 
@@ -93,7 +85,22 @@ enum {
  * states from the controller.
  */
 enum {
+        HCI_SETUP,
+        HCI_AUTO_OFF,
+        HCI_MGMT,
+        HCI_PAIRABLE,
+        HCI_SERVICE_CACHE,
+        HCI_LINK_KEYS,
+        HCI_DEBUG_KEYS,
+
         HCI_LE_SCAN,
+        HCI_SSP_ENABLED,
+        HCI_HS_ENABLED,
+        HCI_LE_ENABLED,
+        HCI_CONNECTABLE,
+        HCI_DISCOVERABLE,
+        HCI_LINK_SECURITY,
+        HCI_PENDING_CLASS,
 };
 
 /* HCI ioctl defines */
@@ -130,6 +137,7 @@ enum {
 #define HCI_IDLE_TIMEOUT        (6000)  /* 6 seconds */
 #define HCI_INIT_TIMEOUT        (10000) /* 10 seconds */
 #define HCI_CMD_TIMEOUT         (1000)  /* 1 seconds */
+#define HCI_ACL_TX_TIMEOUT      (45000) /* 45 seconds */
 
 /* HCI data types */
 #define HCI_COMMAND_PKT         0x01
@@ -229,7 +237,9 @@ enum {
 #define LMP_EXTFEATURES 0x80
 
 /* Extended LMP features */
-#define LMP_HOST_LE     0x02
+#define LMP_HOST_SSP            0x01
+#define LMP_HOST_LE             0x02
+#define LMP_HOST_LE_BREDR       0x04
 
 /* Connection modes */
 #define HCI_CM_ACTIVE   0x0000
@@ -268,10 +278,11 @@ enum {
 #define HCI_LK_UNAUTH_COMBINATION       0x04
 #define HCI_LK_AUTH_COMBINATION         0x05
 #define HCI_LK_CHANGED_COMBINATION      0x06
-/* The spec doesn't define types for SMP keys */
-#define HCI_LK_SMP_LTK                  0x81
-#define HCI_LK_SMP_IRK                  0x82
-#define HCI_LK_SMP_CSRK                 0x83
+/* The spec doesn't define types for SMP keys, the _MASTER suffix is implied */
+#define HCI_SMP_STK                     0x80
+#define HCI_SMP_STK_SLAVE               0x81
+#define HCI_SMP_LTK                     0x82
+#define HCI_SMP_LTK_SLAVE               0x83
 
 /* ---- HCI Error Codes ---- */
 #define HCI_ERROR_AUTH_FAILURE          0x05
@@ -284,6 +295,22 @@ enum {
 #define HCI_FLOW_CTL_MODE_PACKET_BASED  0x00
 #define HCI_FLOW_CTL_MODE_BLOCK_BASED   0x01
 
+/* Extended Inquiry Response field types */
+#define EIR_FLAGS               0x01 /* flags */
+#define EIR_UUID16_SOME         0x02 /* 16-bit UUID, more available */
+#define EIR_UUID16_ALL          0x03 /* 16-bit UUID, all listed */
+#define EIR_UUID32_SOME         0x04 /* 32-bit UUID, more available */
+#define EIR_UUID32_ALL          0x05 /* 32-bit UUID, all listed */
+#define EIR_UUID128_SOME        0x06 /* 128-bit UUID, more available */
+#define EIR_UUID128_ALL         0x07 /* 128-bit UUID, all listed */
+#define EIR_NAME_SHORT          0x08 /* shortened local name */
+#define EIR_NAME_COMPLETE       0x09 /* complete local name */
+#define EIR_TX_POWER            0x0A /* transmit power level */
+#define EIR_CLASS_OF_DEV        0x0D /* Class of Device */
+#define EIR_SSP_HASH_C          0x0E /* Simple Pairing Hash C */
+#define EIR_SSP_RAND_R          0x0F /* Simple Pairing Randomizer R */
+#define EIR_DEVICE_ID           0x10 /* device ID */
+
 /* -----  HCI Commands ---- */
 #define HCI_OP_NOP                      0x0000
 
@@ -666,8 +693,8 @@ struct hci_cp_host_buffer_size {
 
 #define HCI_OP_WRITE_EIR                0x0c52
 struct hci_cp_write_eir {
-        uint8_t         fec;
-        uint8_t         data[HCI_MAX_EIR_LENGTH];
+        __u8    fec;
+        __u8    data[HCI_MAX_EIR_LENGTH];
 } __packed;
 
 #define HCI_OP_READ_SSP_MODE            0x0c55
@@ -698,8 +725,8 @@ struct hci_rp_read_flow_control_mode {
 
 #define HCI_OP_WRITE_LE_HOST_SUPPORTED  0x0c6d
 struct hci_cp_write_le_host_supported {
-        __u8 le;
-        __u8 simul;
+        __u8    le;
+        __u8    simul;
 } __packed;
 
 #define HCI_OP_READ_LOCAL_VERSION       0x1001
@@ -1155,6 +1182,19 @@ struct hci_ev_le_meta {
         __u8     subevent;
 } __packed;
 
+#define HCI_EV_NUM_COMP_BLOCKS          0x48
+struct hci_comp_blocks_info {
+        __le16   handle;
+        __le16   pkts;
+        __le16   blocks;
+} __packed;
+
+struct hci_ev_num_comp_blocks {
+        __le16   num_blocks;
+        __u8     num_hndl;
+        struct hci_comp_blocks_info handles[0];
+} __packed;
+
 /* Low energy meta events */
 #define HCI_EV_LE_CONN_COMPLETE         0x01
 struct hci_ev_le_conn_complete {
@@ -1288,6 +1328,7 @@ struct sockaddr_hci {
 
 #define HCI_CHANNEL_RAW         0
 #define HCI_CHANNEL_CONTROL     1
+#define HCI_CHANNEL_MONITOR     2
 
 struct hci_filter {
         unsigned long type_mask;
@@ -1389,5 +1430,6 @@ struct hci_inquiry_req {
 #define IREQ_CACHE_FLUSH 0x0001
 
 extern bool enable_hs;
+extern bool enable_le;
 
 #endif /* __HCI_H */