#define HCI_LM_SECURE  0x0020
 
 /* -----  HCI Commands ---- */
-/* OGF & OCF values */
-
-/* Informational Parameters */
-#define OGF_INFO_PARAM 0x04
-
-#define OCF_READ_LOCAL_VERSION 0x0001
-struct hci_rp_read_loc_version {
-       __u8     status;
-       __u8     hci_ver;
-       __le16   hci_rev;
-       __u8     lmp_ver;
-       __le16   manufacturer;
-       __le16   lmp_subver;
-} __attribute__ ((packed));
-
-#define OCF_READ_LOCAL_FEATURES        0x0003
-struct hci_rp_read_local_features {
-       __u8 status;
-       __u8 features[8];
-} __attribute__ ((packed));
-
-#define OCF_READ_BUFFER_SIZE   0x0005
-struct hci_rp_read_buffer_size {
-       __u8     status;
-       __le16   acl_mtu;
-       __u8     sco_mtu;
-       __le16   acl_max_pkt;
-       __le16   sco_max_pkt;
-} __attribute__ ((packed));
-
-#define OCF_READ_BD_ADDR       0x0009
-struct hci_rp_read_bd_addr {
-       __u8     status;
-       bdaddr_t bdaddr;
-} __attribute__ ((packed));
-
-/* Host Controller and Baseband */
-#define OGF_HOST_CTL   0x03
-#define OCF_RESET              0x0003
-#define OCF_READ_AUTH_ENABLE   0x001F
-#define OCF_WRITE_AUTH_ENABLE  0x0020
-       #define AUTH_DISABLED           0x00
-       #define AUTH_ENABLED            0x01
-
-#define OCF_READ_ENCRYPT_MODE  0x0021
-#define OCF_WRITE_ENCRYPT_MODE 0x0022
-       #define ENCRYPT_DISABLED        0x00
-       #define ENCRYPT_P2P             0x01
-       #define ENCRYPT_BOTH            0x02
-
-#define OCF_WRITE_CA_TIMEOUT   0x0016  
-#define OCF_WRITE_PG_TIMEOUT   0x0018
-
-#define OCF_WRITE_SCAN_ENABLE  0x001A
-       #define SCAN_DISABLED           0x00
-       #define SCAN_INQUIRY            0x01
-       #define SCAN_PAGE               0x02
-
-#define OCF_SET_EVENT_FLT      0x0005
-struct hci_cp_set_event_flt {
-       __u8     flt_type;
-       __u8     cond_type;
-       __u8     condition[0];
-} __attribute__ ((packed));
-
-/* Filter types */
-#define HCI_FLT_CLEAR_ALL      0x00
-#define HCI_FLT_INQ_RESULT     0x01
-#define HCI_FLT_CONN_SETUP     0x02
-
-/* CONN_SETUP Condition types */
-#define HCI_CONN_SETUP_ALLOW_ALL       0x00
-#define HCI_CONN_SETUP_ALLOW_CLASS     0x01
-#define HCI_CONN_SETUP_ALLOW_BDADDR    0x02
-
-/* CONN_SETUP Conditions */
-#define HCI_CONN_SETUP_AUTO_OFF        0x01
-#define HCI_CONN_SETUP_AUTO_ON 0x02
-
-#define OCF_READ_CLASS_OF_DEV  0x0023
-struct hci_rp_read_dev_class {
-       __u8     status;
-       __u8     dev_class[3];
-} __attribute__ ((packed));
-
-#define OCF_WRITE_CLASS_OF_DEV 0x0024
-struct hci_cp_write_dev_class {
-       __u8     dev_class[3];
-} __attribute__ ((packed));
-
-#define OCF_READ_VOICE_SETTING 0x0025
-struct hci_rp_read_voice_setting {
-       __u8     status;
-       __le16   voice_setting;
+#define HCI_OP_INQUIRY                 0x0401
+struct hci_cp_inquiry {
+       __u8     lap[3];
+       __u8     length;
+       __u8     num_rsp;
 } __attribute__ ((packed));
 
-#define OCF_WRITE_VOICE_SETTING        0x0026
-struct hci_cp_write_voice_setting {
-       __le16   voice_setting;
-} __attribute__ ((packed));
+#define HCI_OP_INQUIRY_CANCEL          0x0402
 
-#define OCF_HOST_BUFFER_SIZE   0x0033
-struct hci_cp_host_buffer_size {
-       __le16   acl_mtu;
-       __u8     sco_mtu;
-       __le16   acl_max_pkt;
-       __le16   sco_max_pkt;
-} __attribute__ ((packed));
-
-/* Link Control */
-#define OGF_LINK_CTL   0x01 
+#define HCI_OP_EXIT_PERIODIC_INQ       0x0404
 
-#define OCF_CREATE_CONN                0x0005
+#define HCI_OP_CREATE_CONN             0x0405
 struct hci_cp_create_conn {
        bdaddr_t bdaddr;
        __le16   pkt_type;
        __u8     role_switch;
 } __attribute__ ((packed));
 
-#define OCF_CREATE_CONN_CANCEL 0x0008
-struct hci_cp_create_conn_cancel {
-       bdaddr_t bdaddr;
-} __attribute__ ((packed));
-
-#define OCF_ACCEPT_CONN_REQ    0x0009
-struct hci_cp_accept_conn_req {
-       bdaddr_t bdaddr;
-       __u8     role;
-} __attribute__ ((packed));
-
-#define OCF_REJECT_CONN_REQ    0x000a
-struct hci_cp_reject_conn_req {
-       bdaddr_t bdaddr;
-       __u8     reason;
-} __attribute__ ((packed));
-
-#define OCF_DISCONNECT 0x0006
+#define HCI_OP_DISCONNECT              0x0406
 struct hci_cp_disconnect {
        __le16   handle;
        __u8     reason;
 } __attribute__ ((packed));
 
-#define OCF_ADD_SCO    0x0007
+#define HCI_OP_ADD_SCO                 0x0407
 struct hci_cp_add_sco {
        __le16   handle;
        __le16   pkt_type;
 } __attribute__ ((packed));
 
-#define OCF_INQUIRY            0x0001
-struct hci_cp_inquiry {
-       __u8     lap[3];
-       __u8     length;
-       __u8     num_rsp;
+#define HCI_OP_CREATE_CONN_CANCEL      0x0408
+struct hci_cp_create_conn_cancel {
+       bdaddr_t bdaddr;
 } __attribute__ ((packed));
 
-#define OCF_INQUIRY_CANCEL     0x0002
+#define HCI_OP_ACCEPT_CONN_REQ         0x0409
+struct hci_cp_accept_conn_req {
+       bdaddr_t bdaddr;
+       __u8     role;
+} __attribute__ ((packed));
 
-#define OCF_EXIT_PERIODIC_INQ  0x0004
+#define HCI_OP_REJECT_CONN_REQ         0x040a
+struct hci_cp_reject_conn_req {
+       bdaddr_t bdaddr;
+       __u8     reason;
+} __attribute__ ((packed));
 
-#define OCF_LINK_KEY_REPLY     0x000B
+#define HCI_OP_LINK_KEY_REPLY          0x040b
 struct hci_cp_link_key_reply {
        bdaddr_t bdaddr;
        __u8     link_key[16];
 } __attribute__ ((packed));
 
-#define OCF_LINK_KEY_NEG_REPLY 0x000C
+#define HCI_OP_LINK_KEY_NEG_REPLY      0x040c
 struct hci_cp_link_key_neg_reply {
        bdaddr_t bdaddr;
 } __attribute__ ((packed));
 
-#define OCF_PIN_CODE_REPLY     0x000D
+#define HCI_OP_PIN_CODE_REPLY          0x040d
 struct hci_cp_pin_code_reply {
        bdaddr_t bdaddr;
        __u8     pin_len;
        __u8     pin_code[16];
 } __attribute__ ((packed));
 
-#define OCF_PIN_CODE_NEG_REPLY 0x000E
+#define HCI_OP_PIN_CODE_NEG_REPLY      0x040e
 struct hci_cp_pin_code_neg_reply {
        bdaddr_t bdaddr;
 } __attribute__ ((packed));
 
-#define OCF_CHANGE_CONN_PTYPE  0x000F
+#define HCI_OP_CHANGE_CONN_PTYPE       0x040f
 struct hci_cp_change_conn_ptype {
        __le16   handle;
        __le16   pkt_type;
 } __attribute__ ((packed));
 
-#define OCF_AUTH_REQUESTED     0x0011
+#define HCI_OP_AUTH_REQUESTED          0x0411
 struct hci_cp_auth_requested {
        __le16   handle;
 } __attribute__ ((packed));
 
-#define OCF_SET_CONN_ENCRYPT   0x0013
+#define HCI_OP_SET_CONN_ENCRYPT                0x0413
 struct hci_cp_set_conn_encrypt {
        __le16   handle;
        __u8     encrypt;
 } __attribute__ ((packed));
 
-#define OCF_CHANGE_CONN_LINK_KEY 0x0015
+#define HCI_OP_CHANGE_CONN_LINK_KEY    0x0415
 struct hci_cp_change_conn_link_key {
        __le16   handle;
 } __attribute__ ((packed));
 
-#define OCF_READ_REMOTE_FEATURES 0x001B
+#define HCI_OP_REMOTE_NAME_REQ         0x0419
+struct hci_cp_remote_name_req {
+       bdaddr_t bdaddr;
+       __u8     pscan_rep_mode;
+       __u8     pscan_mode;
+       __le16   clock_offset;
+} __attribute__ ((packed));
+
+#define HCI_OP_REMOTE_NAME_REQ_CANCEL  0x041a
+struct hci_cp_remote_name_req_cancel {
+       bdaddr_t bdaddr;
+} __attribute__ ((packed));
+
+#define HCI_OP_READ_REMOTE_FEATURES    0x041b
 struct hci_cp_read_remote_features {
        __le16   handle;
 } __attribute__ ((packed));
 
-#define OCF_READ_REMOTE_VERSION 0x001D
+#define HCI_OP_READ_REMOTE_EXT_FEATURES        0x041c
+struct hci_cp_read_remote_ext_features {
+       __le16   handle;
+       __u8     page;
+} __attribute__ ((packed));
+
+#define HCI_OP_READ_REMOTE_VERSION     0x041d
 struct hci_cp_read_remote_version {
        __le16   handle;
 } __attribute__ ((packed));
 
-/* Link Policy */
-#define OGF_LINK_POLICY        0x02   
+#define HCI_OP_SETUP_SYNC_CONN         0x0428
+struct hci_cp_setup_sync_conn {
+       __le16   handle;
+       __le32   tx_bandwidth;
+       __le32   rx_bandwidth;
+       __le16   max_latency;
+       __le16   voice_setting;
+       __u8     retrans_effort;
+       __le16   pkt_type;
+} __attribute__ ((packed));
 
-#define OCF_SNIFF_MODE         0x0003
+#define HCI_OP_ACCEPT_SYNC_CONN_REQ    0x0429
+struct hci_cp_accept_sync_conn_req {
+       bdaddr_t bdaddr;
+       __le32   tx_bandwidth;
+       __le32   rx_bandwidth;
+       __le16   max_latency;
+       __le16   content_format;
+       __u8     retrans_effort;
+       __le16   pkt_type;
+} __attribute__ ((packed));
+
+#define HCI_OP_REJECT_SYNC_CONN_REQ    0x042a
+struct hci_cp_reject_sync_conn_req {
+       bdaddr_t bdaddr;
+       __u8     reason;
+} __attribute__ ((packed));
+
+#define HCI_OP_SNIFF_MODE              0x0803
 struct hci_cp_sniff_mode {
        __le16   handle;
        __le16   max_interval;
        __le16   timeout;
 } __attribute__ ((packed));
 
-#define OCF_EXIT_SNIFF_MODE    0x0004
+#define HCI_OP_EXIT_SNIFF_MODE         0x0804
 struct hci_cp_exit_sniff_mode {
        __le16   handle;
 } __attribute__ ((packed));
 
-#define OCF_ROLE_DISCOVERY     0x0009
+#define HCI_OP_ROLE_DISCOVERY          0x0809
 struct hci_cp_role_discovery {
        __le16   handle;
 } __attribute__ ((packed));
        __u8     role;
 } __attribute__ ((packed));
 
-#define OCF_READ_LINK_POLICY   0x000C
+#define HCI_OP_SWITCH_ROLE             0x080b
+struct hci_cp_switch_role {
+       bdaddr_t bdaddr;
+       __u8     role;
+} __attribute__ ((packed));
+
+#define HCI_OP_READ_LINK_POLICY                0x080c
 struct hci_cp_read_link_policy {
        __le16   handle;
 } __attribute__ ((packed));
        __le16   policy;
 } __attribute__ ((packed));
 
-#define OCF_SWITCH_ROLE                0x000B
-struct hci_cp_switch_role {
-       bdaddr_t bdaddr;
-       __u8     role;
-} __attribute__ ((packed));
-
-#define OCF_WRITE_LINK_POLICY  0x000D
+#define HCI_OP_WRITE_LINK_POLICY       0x080d
 struct hci_cp_write_link_policy {
        __le16   handle;
        __le16   policy;
        __le16   handle;
 } __attribute__ ((packed));
 
-#define OCF_SNIFF_SUBRATE      0x0011
+#define HCI_OP_SNIFF_SUBRATE           0x0811
 struct hci_cp_sniff_subrate {
        __le16   handle;
        __le16   max_latency;
        __le16   min_local_timeout;
 } __attribute__ ((packed));
 
-/* Status params */
-#define OGF_STATUS_PARAM       0x05
+#define HCI_OP_SET_EVENT_MASK          0x0c01
+struct hci_cp_set_event_mask {
+       __u8     mask[8];
+} __attribute__ ((packed));
 
-/* Testing commands */
-#define OGF_TESTING_CMD                0x3E
+#define HCI_OP_RESET                   0x0c03
 
-/* Vendor specific commands */
-#define OGF_VENDOR_CMD         0x3F
+#define HCI_OP_SET_EVENT_FLT           0x0c05
+struct hci_cp_set_event_flt {
+       __u8     flt_type;
+       __u8     cond_type;
+       __u8     condition[0];
+} __attribute__ ((packed));
 
-/* ---- HCI Events ---- */
-#define HCI_EV_INQUIRY_COMPLETE        0x01
+/* Filter types */
+#define HCI_FLT_CLEAR_ALL      0x00
+#define HCI_FLT_INQ_RESULT     0x01
+#define HCI_FLT_CONN_SETUP     0x02
 
-#define HCI_EV_INQUIRY_RESULT  0x02
-struct inquiry_info {
-       bdaddr_t bdaddr;
-       __u8     pscan_rep_mode;
-       __u8     pscan_period_mode;
-       __u8     pscan_mode;
+/* CONN_SETUP Condition types */
+#define HCI_CONN_SETUP_ALLOW_ALL       0x00
+#define HCI_CONN_SETUP_ALLOW_CLASS     0x01
+#define HCI_CONN_SETUP_ALLOW_BDADDR    0x02
+
+/* CONN_SETUP Conditions */
+#define HCI_CONN_SETUP_AUTO_OFF        0x01
+#define HCI_CONN_SETUP_AUTO_ON 0x02
+
+#define HCI_OP_WRITE_LOCAL_NAME                0x0c13
+struct hci_cp_write_local_name {
+       __u8     name[248];
+} __attribute__ ((packed));
+
+#define HCI_OP_READ_LOCAL_NAME         0x0c14
+struct hci_rp_read_local_name {
+       __u8     status;
+       __u8     name[248];
+} __attribute__ ((packed));
+
+#define HCI_OP_WRITE_CA_TIMEOUT                0x0c16
+
+#define HCI_OP_WRITE_PG_TIMEOUT                0x0c18
+
+#define HCI_OP_WRITE_SCAN_ENABLE       0x0c1a
+       #define SCAN_DISABLED           0x00
+       #define SCAN_INQUIRY            0x01
+       #define SCAN_PAGE               0x02
+
+#define HCI_OP_READ_AUTH_ENABLE                0x0c1f
+
+#define HCI_OP_WRITE_AUTH_ENABLE       0x0c20
+       #define AUTH_DISABLED           0x00
+       #define AUTH_ENABLED            0x01
+
+#define HCI_OP_READ_ENCRYPT_MODE       0x0c21
+
+#define HCI_OP_WRITE_ENCRYPT_MODE      0x0c22
+       #define ENCRYPT_DISABLED        0x00
+       #define ENCRYPT_P2P             0x01
+       #define ENCRYPT_BOTH            0x02
+
+#define HCI_OP_READ_CLASS_OF_DEV       0x0c23
+struct hci_rp_read_class_of_dev {
+       __u8     status;
        __u8     dev_class[3];
-       __le16   clock_offset;
 } __attribute__ ((packed));
 
-#define HCI_EV_INQUIRY_RESULT_WITH_RSSI        0x22
-struct inquiry_info_with_rssi {
-       bdaddr_t bdaddr;
-       __u8     pscan_rep_mode;
-       __u8     pscan_period_mode;
+#define HCI_OP_WRITE_CLASS_OF_DEV      0x0c24
+struct hci_cp_write_class_of_dev {
        __u8     dev_class[3];
-       __le16   clock_offset;
-       __s8     rssi;
 } __attribute__ ((packed));
-struct inquiry_info_with_rssi_and_pscan_mode {
+
+#define HCI_OP_READ_VOICE_SETTING      0x0c25
+struct hci_rp_read_voice_setting {
+       __u8     status;
+       __le16   voice_setting;
+} __attribute__ ((packed));
+
+#define HCI_OP_WRITE_VOICE_SETTING     0x0c26
+struct hci_cp_write_voice_setting {
+       __le16   voice_setting;
+} __attribute__ ((packed));
+
+#define HCI_OP_HOST_BUFFER_SIZE                0x0c33
+struct hci_cp_host_buffer_size {
+       __le16   acl_mtu;
+       __u8     sco_mtu;
+       __le16   acl_max_pkt;
+       __le16   sco_max_pkt;
+} __attribute__ ((packed));
+
+#define HCI_OP_READ_LOCAL_VERSION      0x1001
+struct hci_rp_read_local_version {
+       __u8     status;
+       __u8     hci_ver;
+       __le16   hci_rev;
+       __u8     lmp_ver;
+       __le16   manufacturer;
+       __le16   lmp_subver;
+} __attribute__ ((packed));
+
+#define HCI_OP_READ_LOCAL_COMMANDS     0x1002
+struct hci_rp_read_local_commands {
+       __u8     status;
+       __u8     commands[64];
+} __attribute__ ((packed));
+
+#define HCI_OP_READ_LOCAL_FEATURES     0x1003
+struct hci_rp_read_local_features {
+       __u8     status;
+       __u8     features[8];
+} __attribute__ ((packed));
+
+#define HCI_OP_READ_LOCAL_EXT_FEATURES 0x1004
+struct hci_rp_read_local_ext_features {
+       __u8     status;
+       __u8     page;
+       __u8     max_page;
+       __u8     features[8];
+} __attribute__ ((packed));
+
+#define HCI_OP_READ_BUFFER_SIZE                0x1005
+struct hci_rp_read_buffer_size {
+       __u8     status;
+       __le16   acl_mtu;
+       __u8     sco_mtu;
+       __le16   acl_max_pkt;
+       __le16   sco_max_pkt;
+} __attribute__ ((packed));
+
+#define HCI_OP_READ_BD_ADDR            0x1009
+struct hci_rp_read_bd_addr {
+       __u8     status;
        bdaddr_t bdaddr;
-       __u8     pscan_rep_mode;
-       __u8     pscan_period_mode;
-       __u8     pscan_mode;
-       __u8     dev_class[3];
-       __le16   clock_offset;
-       __s8     rssi;
 } __attribute__ ((packed));
 
-#define HCI_EV_EXTENDED_INQUIRY_RESULT 0x2F
-struct extended_inquiry_info {
+/* ---- HCI Events ---- */
+#define HCI_EV_INQUIRY_COMPLETE                0x01
+
+#define HCI_EV_INQUIRY_RESULT          0x02
+struct inquiry_info {
        bdaddr_t bdaddr;
        __u8     pscan_rep_mode;
        __u8     pscan_period_mode;
+       __u8     pscan_mode;
        __u8     dev_class[3];
        __le16   clock_offset;
-       __s8     rssi;
-       __u8     data[240];
 } __attribute__ ((packed));
 
-#define HCI_EV_CONN_COMPLETE   0x03
+#define HCI_EV_CONN_COMPLETE           0x03
 struct hci_ev_conn_complete {
        __u8     status;
        __le16   handle;
        __u8     encr_mode;
 } __attribute__ ((packed));
 
-#define HCI_EV_CONN_REQUEST    0x04
+#define HCI_EV_CONN_REQUEST            0x04
 struct hci_ev_conn_request {
        bdaddr_t bdaddr;
        __u8     dev_class[3];
        __u8     link_type;
 } __attribute__ ((packed));
 
-#define HCI_EV_DISCONN_COMPLETE        0x05
+#define HCI_EV_DISCONN_COMPLETE                0x05
 struct hci_ev_disconn_complete {
        __u8     status;
        __le16   handle;
        __u8     reason;
 } __attribute__ ((packed));
 
-#define HCI_EV_AUTH_COMPLETE   0x06
+#define HCI_EV_AUTH_COMPLETE           0x06
 struct hci_ev_auth_complete {
        __u8     status;
        __le16   handle;
 } __attribute__ ((packed));
 
-#define HCI_EV_ENCRYPT_CHANGE  0x08
+#define HCI_EV_REMOTE_NAME             0x07
+struct hci_ev_remote_name {
+       __u8     status;
+       bdaddr_t bdaddr;
+       __u8     name[248];
+} __attribute__ ((packed));
+
+#define HCI_EV_ENCRYPT_CHANGE          0x08
 struct hci_ev_encrypt_change {
        __u8     status;
        __le16   handle;
        __u8     encrypt;
 } __attribute__ ((packed));
 
-#define HCI_EV_CHANGE_CONN_LINK_KEY_COMPLETE   0x09
-struct hci_ev_change_conn_link_key_complete {
+#define HCI_EV_CHANGE_LINK_KEY_COMPLETE        0x09
+struct hci_ev_change_link_key_complete {
+       __u8     status;
+       __le16   handle;
+} __attribute__ ((packed));
+
+#define HCI_EV_REMOTE_FEATURES         0x0b
+struct hci_ev_remote_features {
+       __u8     status;
+       __le16   handle;
+       __u8     features[8];
+} __attribute__ ((packed));
+
+#define HCI_EV_REMOTE_VERSION          0x0c
+struct hci_ev_remote_version {
        __u8     status;
        __le16   handle;
+       __u8     lmp_ver;
+       __le16   manufacturer;
+       __le16   lmp_subver;
 } __attribute__ ((packed));
 
-#define HCI_EV_QOS_SETUP_COMPLETE      0x0D
+#define HCI_EV_QOS_SETUP_COMPLETE      0x0d
 struct hci_qos {
        __u8     service_type;
        __u32    token_rate;
        struct   hci_qos qos;
 } __attribute__ ((packed));
 
-#define HCI_EV_CMD_COMPLETE    0x0E
+#define HCI_EV_CMD_COMPLETE            0x0e
 struct hci_ev_cmd_complete {
        __u8     ncmd;
        __le16   opcode;
 } __attribute__ ((packed));
 
-#define HCI_EV_CMD_STATUS      0x0F
+#define HCI_EV_CMD_STATUS              0x0f
 struct hci_ev_cmd_status {
        __u8     status;
        __u8     ncmd;
        __le16   opcode;
 } __attribute__ ((packed));
 
-#define HCI_EV_NUM_COMP_PKTS   0x13
-struct hci_ev_num_comp_pkts {
-       __u8     num_hndl;
-       /* variable length part */
-} __attribute__ ((packed));
-
-#define HCI_EV_ROLE_CHANGE     0x12
+#define HCI_EV_ROLE_CHANGE             0x12
 struct hci_ev_role_change {
        __u8     status;
        bdaddr_t bdaddr;
        __u8     role;
 } __attribute__ ((packed));
 
-#define HCI_EV_MODE_CHANGE     0x14
+#define HCI_EV_NUM_COMP_PKTS           0x13
+struct hci_ev_num_comp_pkts {
+       __u8     num_hndl;
+       /* variable length part */
+} __attribute__ ((packed));
+
+#define HCI_EV_MODE_CHANGE             0x14
 struct hci_ev_mode_change {
        __u8     status;
        __le16   handle;
        __le16   interval;
 } __attribute__ ((packed));
 
-#define HCI_EV_PIN_CODE_REQ    0x16
+#define HCI_EV_PIN_CODE_REQ            0x16
 struct hci_ev_pin_code_req {
        bdaddr_t bdaddr;
 } __attribute__ ((packed));
 
-#define HCI_EV_LINK_KEY_REQ    0x17
+#define HCI_EV_LINK_KEY_REQ            0x17
 struct hci_ev_link_key_req {
        bdaddr_t bdaddr;
 } __attribute__ ((packed));
 
-#define HCI_EV_LINK_KEY_NOTIFY 0x18
+#define HCI_EV_LINK_KEY_NOTIFY         0x18
 struct hci_ev_link_key_notify {
        bdaddr_t bdaddr;
-       __u8     link_key[16];
-       __u8     key_type;
+       __u8     link_key[16];
+       __u8     key_type;
 } __attribute__ ((packed));
 
-#define HCI_EV_REMOTE_FEATURES 0x0B
-struct hci_ev_remote_features {
+#define HCI_EV_CLOCK_OFFSET            0x1c
+struct hci_ev_clock_offset {
        __u8     status;
        __le16   handle;
-       __u8     features[8];
+       __le16   clock_offset;
 } __attribute__ ((packed));
 
-#define HCI_EV_REMOTE_VERSION  0x0C
-struct hci_ev_remote_version {
+#define HCI_EV_PSCAN_REP_MODE          0x20
+struct hci_ev_pscan_rep_mode {
+       bdaddr_t bdaddr;
+       __u8     pscan_rep_mode;
+} __attribute__ ((packed));
+
+#define HCI_EV_INQUIRY_RESULT_WITH_RSSI        0x22
+struct inquiry_info_with_rssi {
+       bdaddr_t bdaddr;
+       __u8     pscan_rep_mode;
+       __u8     pscan_period_mode;
+       __u8     dev_class[3];
+       __le16   clock_offset;
+       __s8     rssi;
+} __attribute__ ((packed));
+struct inquiry_info_with_rssi_and_pscan_mode {
+       bdaddr_t bdaddr;
+       __u8     pscan_rep_mode;
+       __u8     pscan_period_mode;
+       __u8     pscan_mode;
+       __u8     dev_class[3];
+       __le16   clock_offset;
+       __s8     rssi;
+} __attribute__ ((packed));
+
+#define HCI_EV_REMOTE_EXT_FEATURES     0x23
+struct hci_ev_remote_ext_features {
        __u8     status;
        __le16   handle;
-       __u8     lmp_ver;
-       __le16   manufacturer;
-       __le16   lmp_subver;
+       __u8     page;
+       __u8     max_page;
+       __u8     features[8];
 } __attribute__ ((packed));
 
-#define HCI_EV_CLOCK_OFFSET    0x01C
-struct hci_ev_clock_offset {
+#define HCI_EV_SYNC_CONN_COMPLETE      0x2c
+struct hci_ev_sync_conn_complete {
        __u8     status;
        __le16   handle;
-       __le16   clock_offset;
+       bdaddr_t bdaddr;
+       __u8     link_type;
+       __u8     tx_interval;
+       __u8     retrans_window;
+       __le16   rx_pkt_len;
+       __le16   tx_pkt_len;
+       __u8     air_mode;
 } __attribute__ ((packed));
 
-#define HCI_EV_PSCAN_REP_MODE  0x20
-struct hci_ev_pscan_rep_mode {
-       bdaddr_t bdaddr;
-       __u8     pscan_rep_mode;
+#define HCI_EV_SYNC_CONN_CHANGED       0x2d
+struct hci_ev_sync_conn_changed {
+       __u8     status;
+       __le16   handle;
+       __u8     tx_interval;
+       __u8     retrans_window;
+       __le16   rx_pkt_len;
+       __le16   tx_pkt_len;
 } __attribute__ ((packed));
 
-#define HCI_EV_SNIFF_SUBRATE   0x2E
+#define HCI_EV_SNIFF_SUBRATE           0x2e
 struct hci_ev_sniff_subrate {
        __u8     status;
        __le16   handle;
        __le16   max_local_timeout;
 } __attribute__ ((packed));
 
+#define HCI_EV_EXTENDED_INQUIRY_RESULT 0x2f
+struct extended_inquiry_info {
+       bdaddr_t bdaddr;
+       __u8     pscan_rep_mode;
+       __u8     pscan_period_mode;
+       __u8     dev_class[3];
+       __le16   clock_offset;
+       __s8     rssi;
+       __u8     data[240];
+} __attribute__ ((packed));
+
 /* Internal events generated by Bluetooth stack */
-#define HCI_EV_STACK_INTERNAL  0xFD
+#define HCI_EV_STACK_INTERNAL  0xfd
 struct hci_ev_stack_internal {
        __u16    type;
        __u8     data[0];
 } __attribute__ ((packed));
 
-#define HCI_EV_SI_DEVICE       0x01
+#define HCI_EV_SI_DEVICE       0x01
 struct hci_ev_si_device {
        __u16    event;
        __u16    dev_id;
 #define HCI_SCO_HDR_SIZE     3
 
 struct hci_command_hdr {
-       __le16  opcode;         /* OCF & OGF */
+       __le16  opcode;         /* OCF & OGF */
        __u8    plen;
 } __attribute__ ((packed));
 
 struct hci_event_hdr {
-       __u8    evt;
-       __u8    plen;
+       __u8    evt;
+       __u8    plen;
 } __attribute__ ((packed));
 
 struct hci_acl_hdr {
-       __le16  handle;         /* Handle & Flags(PB, BC) */
-       __le16  dlen;
+       __le16  handle;         /* Handle & Flags(PB, BC) */
+       __le16  dlen;
 } __attribute__ ((packed));
 
 struct hci_sco_hdr {
-       __le16  handle;
-       __u8    dlen;
+       __le16  handle;
+       __u8    dlen;
 } __attribute__ ((packed));
 
 #ifdef __KERNEL__
 #include <linux/skbuff.h>
 static inline struct hci_event_hdr *hci_event_hdr(const struct sk_buff *skb)
 {
-       return (struct hci_event_hdr *)skb->data;
+       return (struct hci_event_hdr *) skb->data;
 }
 
 static inline struct hci_acl_hdr *hci_acl_hdr(const struct sk_buff *skb)
 {
-       return (struct hci_acl_hdr *)skb->data;
+       return (struct hci_acl_hdr *) skb->data;
 }
 
 static inline struct hci_sco_hdr *hci_sco_hdr(const struct sk_buff *skb)
 {
-       return (struct hci_sco_hdr *)skb->data;
+       return (struct hci_sco_hdr *) skb->data;
 }
 #endif
 
 struct hci_filter {
        unsigned long type_mask;
        unsigned long event_mask[2];
-       __le16   opcode;
+       __le16 opcode;
 };
 
 struct hci_ufilter {
-       __u32   type_mask;
-       __u32   event_mask[2];
-       __le16   opcode;
+       __u32  type_mask;
+       __u32  event_mask[2];
+       __le16 opcode;
 };
 
 #define HCI_FLT_TYPE_BITS      31
 struct hci_conn_info {
        __u16    handle;
        bdaddr_t bdaddr;
-       __u8     type;
-       __u8     out;
-       __u16    state;
-       __u32    link_mode;
+       __u8     type;
+       __u8     out;
+       __u16    state;
+       __u32    link_mode;
 };
 
 struct hci_dev_req {
-       __u16 dev_id;
-       __u32 dev_opt;
+       __u16  dev_id;
+       __u32  dev_opt;
 };
 
 struct hci_dev_list_req {
 
 
 /* Handle HCI Event packets */
 
-/* Command Complete OGF LINK_CTL  */
-static void hci_cc_link_ctl(struct hci_dev *hdev, __u16 ocf, struct sk_buff *skb)
+static void hci_cc_inquiry_cancel(struct hci_dev *hdev, struct sk_buff *skb)
 {
-       __u8 status;
-       struct hci_conn *pend;
+       __u8 status = *((__u8 *) skb->data);
 
-       BT_DBG("%s ocf 0x%x", hdev->name, ocf);
+       BT_DBG("%s status 0x%x", hdev->name, status);
 
-       switch (ocf) {
-       case OCF_INQUIRY_CANCEL:
-       case OCF_EXIT_PERIODIC_INQ:
-               status = *((__u8 *) skb->data);
+       if (status)
+               return;
 
-               if (status) {
-                       BT_DBG("%s Inquiry cancel error: status 0x%x", hdev->name, status);
-               } else {
-                       clear_bit(HCI_INQUIRY, &hdev->flags);
-                       hci_req_complete(hdev, status);
-               }
+       clear_bit(HCI_INQUIRY, &hdev->flags);
 
-               hci_dev_lock(hdev);
+       hci_req_complete(hdev, status);
+
+       hci_conn_check_pending(hdev);
+}
 
-               pend = hci_conn_hash_lookup_state(hdev, ACL_LINK, BT_CONNECT2);
-               if (pend)
-                       hci_acl_connect(pend);
+static void hci_cc_exit_periodic_inq(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       __u8 status = *((__u8 *) skb->data);
 
-               hci_dev_unlock(hdev);
+       BT_DBG("%s status 0x%x", hdev->name, status);
 
-               break;
+       if (status)
+               return;
 
-       default:
-               BT_DBG("%s Command complete: ogf LINK_CTL ocf %x", hdev->name, ocf);
-               break;
+       clear_bit(HCI_INQUIRY, &hdev->flags);
+
+       hci_conn_check_pending(hdev);
+}
+
+static void hci_cc_remote_name_req_cancel(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       BT_DBG("%s", hdev->name);
+}
+
+static void hci_cc_role_discovery(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       struct hci_rp_role_discovery *rp = (void *) skb->data;
+       struct hci_conn *conn;
+
+       BT_DBG("%s status 0x%x", hdev->name, rp->status);
+
+       if (rp->status)
+               return;
+
+       hci_dev_lock(hdev);
+
+       conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(rp->handle));
+       if (conn) {
+               if (rp->role)
+                       conn->link_mode &= ~HCI_LM_MASTER;
+               else
+                       conn->link_mode |= HCI_LM_MASTER;
        }
+
+       hci_dev_unlock(hdev);
 }
 
-/* Command Complete OGF LINK_POLICY  */
-static void hci_cc_link_policy(struct hci_dev *hdev, __u16 ocf, struct sk_buff *skb)
+static void hci_cc_write_link_policy(struct hci_dev *hdev, struct sk_buff *skb)
 {
+       struct hci_rp_write_link_policy *rp = (void *) skb->data;
        struct hci_conn *conn;
-       struct hci_rp_role_discovery *rd;
-       struct hci_rp_write_link_policy *lp;
        void *sent;
 
-       BT_DBG("%s ocf 0x%x", hdev->name, ocf);
+       BT_DBG("%s status 0x%x", hdev->name, rp->status);
 
-       switch (ocf) {
-       case OCF_ROLE_DISCOVERY:
-               rd = (void *) skb->data;
+       if (rp->status)
+               return;
 
-               if (rd->status)
-                       break;
+       sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_LINK_POLICY);
+       if (!sent)
+               return;
 
-               hci_dev_lock(hdev);
+       hci_dev_lock(hdev);
 
-               conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(rd->handle));
-               if (conn) {
-                       if (rd->role)
-                               conn->link_mode &= ~HCI_LM_MASTER;
-                       else
-                               conn->link_mode |= HCI_LM_MASTER;
-               }
+       conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(rp->handle));
+       if (conn) {
+               __le16 policy = get_unaligned((__le16 *) (sent + 2));
+               conn->link_policy = __le16_to_cpu(policy);
+       }
 
-               hci_dev_unlock(hdev);
-               break;
+       hci_dev_unlock(hdev);
+}
 
-       case OCF_WRITE_LINK_POLICY:
-               sent = hci_sent_cmd_data(hdev, OGF_LINK_POLICY, OCF_WRITE_LINK_POLICY);
-               if (!sent)
-                       break;
+static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       __u8 status = *((__u8 *) skb->data);
 
-               lp = (struct hci_rp_write_link_policy *) skb->data;
+       BT_DBG("%s status 0x%x", hdev->name, status);
 
-               if (lp->status)
-                       break;
+       hci_req_complete(hdev, status);
+}
 
-               hci_dev_lock(hdev);
+static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       __u8 status = *((__u8 *) skb->data);
+       void *sent;
 
-               conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(lp->handle));
-               if (conn) {
-                       __le16 policy = get_unaligned((__le16 *) (sent + 2));
-                       conn->link_policy = __le16_to_cpu(policy);
-               }
+       BT_DBG("%s status 0x%x", hdev->name, status);
 
-               hci_dev_unlock(hdev);
-               break;
+       sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_LOCAL_NAME);
+       if (!sent)
+               return;
 
-       default:
-               BT_DBG("%s: Command complete: ogf LINK_POLICY ocf %x",
-                               hdev->name, ocf);
-               break;
+       if (!status)
+               memcpy(hdev->dev_name, sent, 248);
+}
+
+static void hci_cc_read_local_name(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       struct hci_rp_read_local_name *rp = (void *) skb->data;
+
+       BT_DBG("%s status 0x%x", hdev->name, rp->status);
+
+       if (rp->status)
+               return;
+
+       memcpy(hdev->dev_name, rp->name, 248);
+}
+
+static void hci_cc_write_auth_enable(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       __u8 status = *((__u8 *) skb->data);
+       void *sent;
+
+       BT_DBG("%s status 0x%x", hdev->name, status);
+
+       sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_AUTH_ENABLE);
+       if (!sent)
+               return;
+
+       if (!status) {
+               __u8 param = *((__u8 *) sent);
+
+               if (param == AUTH_ENABLED)
+                       set_bit(HCI_AUTH, &hdev->flags);
+               else
+                       clear_bit(HCI_AUTH, &hdev->flags);
        }
+
+       hci_req_complete(hdev, status);
 }
 
-/* Command Complete OGF HOST_CTL  */
-static void hci_cc_host_ctl(struct hci_dev *hdev, __u16 ocf, struct sk_buff *skb)
+static void hci_cc_write_encrypt_mode(struct hci_dev *hdev, struct sk_buff *skb)
 {
-       __u8 status, param;
-       __u16 setting;
-       struct hci_rp_read_voice_setting *vs;
+       __u8 status = *((__u8 *) skb->data);
        void *sent;
 
-       BT_DBG("%s ocf 0x%x", hdev->name, ocf);
+       BT_DBG("%s status 0x%x", hdev->name, status);
 
-       switch (ocf) {
-       case OCF_RESET:
-               status = *((__u8 *) skb->data);
-               hci_req_complete(hdev, status);
-               break;
+       sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_ENCRYPT_MODE);
+       if (!sent)
+               return;
 
-       case OCF_SET_EVENT_FLT:
-               status = *((__u8 *) skb->data);
-               if (status) {
-                       BT_DBG("%s SET_EVENT_FLT failed %d", hdev->name, status);
-               } else {
-                       BT_DBG("%s SET_EVENT_FLT succeseful", hdev->name);
-               }
-               break;
+       if (!status) {
+               __u8 param = *((__u8 *) sent);
+
+               if (param)
+                       set_bit(HCI_ENCRYPT, &hdev->flags);
+               else
+                       clear_bit(HCI_ENCRYPT, &hdev->flags);
+       }
 
-       case OCF_WRITE_AUTH_ENABLE:
-               sent = hci_sent_cmd_data(hdev, OGF_HOST_CTL, OCF_WRITE_AUTH_ENABLE);
-               if (!sent)
-                       break;
+       hci_req_complete(hdev, status);
+}
 
-               status = *((__u8 *) skb->data);
-               param  = *((__u8 *) sent);
+static void hci_cc_write_scan_enable(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       __u8 status = *((__u8 *) skb->data);
+       void *sent;
 
-               if (!status) {
-                       if (param == AUTH_ENABLED)
-                               set_bit(HCI_AUTH, &hdev->flags);
-                       else
-                               clear_bit(HCI_AUTH, &hdev->flags);
-               }
-               hci_req_complete(hdev, status);
-               break;
+       BT_DBG("%s status 0x%x", hdev->name, status);
 
-       case OCF_WRITE_ENCRYPT_MODE:
-               sent = hci_sent_cmd_data(hdev, OGF_HOST_CTL, OCF_WRITE_ENCRYPT_MODE);
-               if (!sent)
-                       break;
+       sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_SCAN_ENABLE);
+       if (!sent)
+               return;
 
-               status = *((__u8 *) skb->data);
-               param  = *((__u8 *) sent);
+       if (!status) {
+               __u8 param = *((__u8 *) sent);
 
-               if (!status) {
-                       if (param)
-                               set_bit(HCI_ENCRYPT, &hdev->flags);
-                       else
-                               clear_bit(HCI_ENCRYPT, &hdev->flags);
-               }
-               hci_req_complete(hdev, status);
-               break;
+               clear_bit(HCI_PSCAN, &hdev->flags);
+               clear_bit(HCI_ISCAN, &hdev->flags);
 
-       case OCF_WRITE_CA_TIMEOUT:
-               status = *((__u8 *) skb->data);
-               if (status) {
-                       BT_DBG("%s OCF_WRITE_CA_TIMEOUT failed %d", hdev->name, status);
-               } else {
-                       BT_DBG("%s OCF_WRITE_CA_TIMEOUT succeseful", hdev->name);
-               }
-               break;
+               if (param & SCAN_INQUIRY)
+                       set_bit(HCI_ISCAN, &hdev->flags);
 
-       case OCF_WRITE_PG_TIMEOUT:
-               status = *((__u8 *) skb->data);
-               if (status) {
-                       BT_DBG("%s OCF_WRITE_PG_TIMEOUT failed %d", hdev->name, status);
-               } else {
-                       BT_DBG("%s: OCF_WRITE_PG_TIMEOUT succeseful", hdev->name);
-               }
-               break;
+               if (param & SCAN_PAGE)
+                       set_bit(HCI_PSCAN, &hdev->flags);
+       }
 
-       case OCF_WRITE_SCAN_ENABLE:
-               sent = hci_sent_cmd_data(hdev, OGF_HOST_CTL, OCF_WRITE_SCAN_ENABLE);
-               if (!sent)
-                       break;
+       hci_req_complete(hdev, status);
+}
 
-               status = *((__u8 *) skb->data);
-               param  = *((__u8 *) sent);
+static void hci_cc_read_class_of_dev(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       struct hci_rp_read_class_of_dev *rp = (void *) skb->data;
 
-               BT_DBG("param 0x%x", param);
+       BT_DBG("%s status 0x%x", hdev->name, rp->status);
 
-               if (!status) {
-                       clear_bit(HCI_PSCAN, &hdev->flags);
-                       clear_bit(HCI_ISCAN, &hdev->flags);
-                       if (param & SCAN_INQUIRY)
-                               set_bit(HCI_ISCAN, &hdev->flags);
+       if (rp->status)
+               return;
 
-                       if (param & SCAN_PAGE)
-                               set_bit(HCI_PSCAN, &hdev->flags);
-               }
-               hci_req_complete(hdev, status);
-               break;
+       memcpy(hdev->dev_class, rp->dev_class, 3);
 
-       case OCF_READ_VOICE_SETTING:
-               vs = (struct hci_rp_read_voice_setting *) skb->data;
+       BT_DBG("%s class 0x%.2x%.2x%.2x", hdev->name,
+               hdev->dev_class[2], hdev->dev_class[1], hdev->dev_class[0]);
+}
 
-               if (vs->status) {
-                       BT_DBG("%s READ_VOICE_SETTING failed %d", hdev->name, vs->status);
-                       break;
-               }
+static void hci_cc_write_class_of_dev(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       __u8 status = *((__u8 *) skb->data);
+       void *sent;
 
-               setting = __le16_to_cpu(vs->voice_setting);
+       BT_DBG("%s status 0x%x", hdev->name, status);
 
-               if (hdev->voice_setting != setting ) {
-                       hdev->voice_setting = setting;
+       sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_CLASS_OF_DEV);
+       if (!sent)
+               return;
 
-                       BT_DBG("%s: voice setting 0x%04x", hdev->name, setting);
+       if (!status)
+               memcpy(hdev->dev_class, sent, 3);
+}
 
-                       if (hdev->notify) {
-                               tasklet_disable(&hdev->tx_task);
-                               hdev->notify(hdev, HCI_NOTIFY_VOICE_SETTING);
-                               tasklet_enable(&hdev->tx_task);
-                       }
-               }
-               break;
+static void hci_cc_read_voice_setting(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       struct hci_rp_read_voice_setting *rp = (void *) skb->data;
+       __u16 setting;
+
+       BT_DBG("%s status 0x%x", hdev->name, rp->status);
+
+       if (rp->status)
+               return;
+
+       setting = __le16_to_cpu(rp->voice_setting);
+
+       if (hdev->voice_setting == setting )
+               return;
+
+       hdev->voice_setting = setting;
+
+       BT_DBG("%s voice setting 0x%04x", hdev->name, setting);
+
+       if (hdev->notify) {
+               tasklet_disable(&hdev->tx_task);
+               hdev->notify(hdev, HCI_NOTIFY_VOICE_SETTING);
+               tasklet_enable(&hdev->tx_task);
+       }
+}
+
+static void hci_cc_write_voice_setting(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       __u8 status = *((__u8 *) skb->data);
+       void *sent;
+
+       BT_DBG("%s status 0x%x", hdev->name, status);
 
-       case OCF_WRITE_VOICE_SETTING:
-               sent = hci_sent_cmd_data(hdev, OGF_HOST_CTL, OCF_WRITE_VOICE_SETTING);
-               if (!sent)
-                       break;
+       sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_VOICE_SETTING);
+       if (!sent)
+               return;
 
-               status = *((__u8 *) skb->data);
-               setting = __le16_to_cpu(get_unaligned((__le16 *) sent));
+       if (!status) {
+               __u16 setting = __le16_to_cpu(get_unaligned((__le16 *) sent));
 
-               if (!status && hdev->voice_setting != setting) {
+               if (hdev->voice_setting != setting) {
                        hdev->voice_setting = setting;
 
-                       BT_DBG("%s: voice setting 0x%04x", hdev->name, setting);
+                       BT_DBG("%s voice setting 0x%04x", hdev->name, setting);
 
                        if (hdev->notify) {
                                tasklet_disable(&hdev->tx_task);
                                tasklet_enable(&hdev->tx_task);
                        }
                }
-               hci_req_complete(hdev, status);
-               break;
-
-       case OCF_HOST_BUFFER_SIZE:
-               status = *((__u8 *) skb->data);
-               if (status) {
-                       BT_DBG("%s OCF_BUFFER_SIZE failed %d", hdev->name, status);
-                       hci_req_complete(hdev, status);
-               }
-               break;
-
-       default:
-               BT_DBG("%s Command complete: ogf HOST_CTL ocf %x", hdev->name, ocf);
-               break;
        }
 }
 
-/* Command Complete OGF INFO_PARAM  */
-static void hci_cc_info_param(struct hci_dev *hdev, __u16 ocf, struct sk_buff *skb)
+static void hci_cc_host_buffer_size(struct hci_dev *hdev, struct sk_buff *skb)
 {
-       struct hci_rp_read_loc_version *lv;
-       struct hci_rp_read_local_features *lf;
-       struct hci_rp_read_buffer_size *bs;
-       struct hci_rp_read_bd_addr *ba;
+       __u8 status = *((__u8 *) skb->data);
 
-       BT_DBG("%s ocf 0x%x", hdev->name, ocf);
+       BT_DBG("%s status 0x%x", hdev->name, status);
 
-       switch (ocf) {
-       case OCF_READ_LOCAL_VERSION:
-               lv = (struct hci_rp_read_loc_version *) skb->data;
+       hci_req_complete(hdev, status);
+}
 
-               if (lv->status) {
-                       BT_DBG("%s READ_LOCAL_VERSION failed %d", hdev->name, lf->status);
-                       break;
-               }
+static void hci_cc_read_local_version(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       struct hci_rp_read_local_version *rp = (void *) skb->data;
 
-               hdev->hci_ver = lv->hci_ver;
-               hdev->hci_rev = btohs(lv->hci_rev);
-               hdev->manufacturer = btohs(lv->manufacturer);
+       BT_DBG("%s status 0x%x", hdev->name, rp->status);
 
-               BT_DBG("%s: manufacturer %d hci_ver %d hci_rev %d", hdev->name,
-                               hdev->manufacturer, hdev->hci_ver, hdev->hci_rev);
+       if (rp->status)
+               return;
 
-               break;
+       hdev->hci_ver = rp->hci_ver;
+       hdev->hci_rev = btohs(rp->hci_rev);
+       hdev->manufacturer = btohs(rp->manufacturer);
 
-       case OCF_READ_LOCAL_FEATURES:
-               lf = (struct hci_rp_read_local_features *) skb->data;
+       BT_DBG("%s manufacturer %d hci ver %d:%d", hdev->name,
+                                       hdev->manufacturer,
+                                       hdev->hci_ver, hdev->hci_rev);
+}
 
-               if (lf->status) {
-                       BT_DBG("%s READ_LOCAL_FEATURES failed %d", hdev->name, lf->status);
-                       break;
-               }
+static void hci_cc_read_local_commands(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       struct hci_rp_read_local_commands *rp = (void *) skb->data;
 
-               memcpy(hdev->features, lf->features, sizeof(hdev->features));
+       BT_DBG("%s status 0x%x", hdev->name, rp->status);
 
-               /* Adjust default settings according to features
-                * supported by device. */
-               if (hdev->features[0] & LMP_3SLOT)
-                       hdev->pkt_type |= (HCI_DM3 | HCI_DH3);
+       if (rp->status)
+               return;
 
-               if (hdev->features[0] & LMP_5SLOT)
-                       hdev->pkt_type |= (HCI_DM5 | HCI_DH5);
+       memcpy(hdev->commands, rp->commands, sizeof(hdev->commands));
+}
 
-               if (hdev->features[1] & LMP_HV2) {
-                       hdev->pkt_type  |= (HCI_HV2);
-                       hdev->esco_type |= (ESCO_HV2);
-               }
+static void hci_cc_read_local_features(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       struct hci_rp_read_local_features *rp = (void *) skb->data;
 
-               if (hdev->features[1] & LMP_HV3) {
-                       hdev->pkt_type  |= (HCI_HV3);
-                       hdev->esco_type |= (ESCO_HV3);
-               }
+       BT_DBG("%s status 0x%x", hdev->name, rp->status);
 
-               if (hdev->features[3] & LMP_ESCO)
-                       hdev->esco_type |= (ESCO_EV3);
+       if (rp->status)
+               return;
 
-               if (hdev->features[4] & LMP_EV4)
-                       hdev->esco_type |= (ESCO_EV4);
+       memcpy(hdev->features, rp->features, 8);
 
-               if (hdev->features[4] & LMP_EV5)
-                       hdev->esco_type |= (ESCO_EV5);
+       /* Adjust default settings according to features
+        * supported by device. */
 
-               BT_DBG("%s: features 0x%x 0x%x 0x%x", hdev->name,
-                               lf->features[0], lf->features[1], lf->features[2]);
+       if (hdev->features[0] & LMP_3SLOT)
+               hdev->pkt_type |= (HCI_DM3 | HCI_DH3);
 
-               break;
+       if (hdev->features[0] & LMP_5SLOT)
+               hdev->pkt_type |= (HCI_DM5 | HCI_DH5);
 
-       case OCF_READ_BUFFER_SIZE:
-               bs = (struct hci_rp_read_buffer_size *) skb->data;
+       if (hdev->features[1] & LMP_HV2) {
+               hdev->pkt_type  |= (HCI_HV2);
+               hdev->esco_type |= (ESCO_HV2);
+       }
 
-               if (bs->status) {
-                       BT_DBG("%s READ_BUFFER_SIZE failed %d", hdev->name, bs->status);
-                       hci_req_complete(hdev, bs->status);
-                       break;
-               }
+       if (hdev->features[1] & LMP_HV3) {
+               hdev->pkt_type  |= (HCI_HV3);
+               hdev->esco_type |= (ESCO_HV3);
+       }
 
-               hdev->acl_mtu  = __le16_to_cpu(bs->acl_mtu);
-               hdev->sco_mtu  = bs->sco_mtu;
-               hdev->acl_pkts = __le16_to_cpu(bs->acl_max_pkt);
-               hdev->sco_pkts = __le16_to_cpu(bs->sco_max_pkt);
+       if (hdev->features[3] & LMP_ESCO)
+               hdev->esco_type |= (ESCO_EV3);
 
-               if (test_bit(HCI_QUIRK_FIXUP_BUFFER_SIZE, &hdev->quirks)) {
-                       hdev->sco_mtu  = 64;
-                       hdev->sco_pkts = 8;
-               }
+       if (hdev->features[4] & LMP_EV4)
+               hdev->esco_type |= (ESCO_EV4);
 
-               hdev->acl_cnt = hdev->acl_pkts;
-               hdev->sco_cnt = hdev->sco_pkts;
+       if (hdev->features[4] & LMP_EV5)
+               hdev->esco_type |= (ESCO_EV5);
 
-               BT_DBG("%s mtu: acl %d, sco %d max_pkt: acl %d, sco %d", hdev->name,
-                       hdev->acl_mtu, hdev->sco_mtu, hdev->acl_pkts, hdev->sco_pkts);
-               break;
+       BT_DBG("%s features 0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x", hdev->name,
+                                       hdev->features[0], hdev->features[1],
+                                       hdev->features[2], hdev->features[3],
+                                       hdev->features[4], hdev->features[5],
+                                       hdev->features[6], hdev->features[7]);
+}
 
-       case OCF_READ_BD_ADDR:
-               ba = (struct hci_rp_read_bd_addr *) skb->data;
+static void hci_cc_read_buffer_size(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       struct hci_rp_read_buffer_size *rp = (void *) skb->data;
 
-               if (!ba->status) {
-                       bacpy(&hdev->bdaddr, &ba->bdaddr);
-               } else {
-                       BT_DBG("%s: READ_BD_ADDR failed %d", hdev->name, ba->status);
-               }
+       BT_DBG("%s status 0x%x", hdev->name, rp->status);
 
-               hci_req_complete(hdev, ba->status);
-               break;
+       if (rp->status)
+               return;
 
-       default:
-               BT_DBG("%s Command complete: ogf INFO_PARAM ocf %x", hdev->name, ocf);
-               break;
+       hdev->acl_mtu  = __le16_to_cpu(rp->acl_mtu);
+       hdev->sco_mtu  = rp->sco_mtu;
+       hdev->acl_pkts = __le16_to_cpu(rp->acl_max_pkt);
+       hdev->sco_pkts = __le16_to_cpu(rp->sco_max_pkt);
+
+       if (test_bit(HCI_QUIRK_FIXUP_BUFFER_SIZE, &hdev->quirks)) {
+               hdev->sco_mtu  = 64;
+               hdev->sco_pkts = 8;
        }
+
+       hdev->acl_cnt = hdev->acl_pkts;
+       hdev->sco_cnt = hdev->sco_pkts;
+
+       BT_DBG("%s acl mtu %d:%d sco mtu %d:%d", hdev->name,
+                                       hdev->acl_mtu, hdev->acl_pkts,
+                                       hdev->sco_mtu, hdev->sco_pkts);
+}
+
+static void hci_cc_read_bd_addr(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       struct hci_rp_read_bd_addr *rp = (void *) skb->data;
+
+       BT_DBG("%s status 0x%x", hdev->name, rp->status);
+
+       if (!rp->status)
+               bacpy(&hdev->bdaddr, &rp->bdaddr);
+
+       hci_req_complete(hdev, rp->status);
+}
+
+static inline void hci_cs_inquiry(struct hci_dev *hdev, __u8 status)
+{
+       BT_DBG("%s status 0x%x", hdev->name, status);
+
+       if (status) {
+               hci_req_complete(hdev, status);
+
+               hci_conn_check_pending(hdev);
+       } else
+               set_bit(HCI_INQUIRY, &hdev->flags);
 }
 
-/* Command Status OGF LINK_CTL  */
 static inline void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)
 {
+       struct hci_cp_create_conn *cp;
        struct hci_conn *conn;
-       struct hci_cp_create_conn *cp = hci_sent_cmd_data(hdev, OGF_LINK_CTL, OCF_CREATE_CONN);
 
+       BT_DBG("%s status 0x%x", hdev->name, status);
+
+       cp = hci_sent_cmd_data(hdev, HCI_OP_CREATE_CONN);
        if (!cp)
                return;
 
 
        conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->bdaddr);
 
-       BT_DBG("%s status 0x%x bdaddr %s conn %p", hdev->name,
-                       status, batostr(&cp->bdaddr), conn);
+       BT_DBG("%s bdaddr %s conn %p", hdev->name, batostr(&cp->bdaddr), conn);
 
        if (status) {
                if (conn && conn->state == BT_CONNECT) {
        hci_dev_unlock(hdev);
 }
 
-static void hci_cs_link_ctl(struct hci_dev *hdev, __u16 ocf, __u8 status)
+static void hci_cs_add_sco(struct hci_dev *hdev, __u8 status)
 {
-       BT_DBG("%s ocf 0x%x", hdev->name, ocf);
+       struct hci_cp_add_sco *cp;
+       struct hci_conn *acl, *sco;
+       __u16 handle;
 
-       switch (ocf) {
-       case OCF_CREATE_CONN:
-               hci_cs_create_conn(hdev, status);
-               break;
+       if (!status)
+               return;
 
-       case OCF_ADD_SCO:
-               if (status) {
-                       struct hci_conn *acl, *sco;
-                       struct hci_cp_add_sco *cp = hci_sent_cmd_data(hdev, OGF_LINK_CTL, OCF_ADD_SCO);
-                       __u16 handle;
+       BT_DBG("%s status 0x%x", hdev->name, status);
 
-                       if (!cp)
-                               break;
+       cp = hci_sent_cmd_data(hdev, HCI_OP_ADD_SCO);
+       if (!cp)
+               return;
 
-                       handle = __le16_to_cpu(cp->handle);
+       handle = __le16_to_cpu(cp->handle);
 
-                       BT_DBG("%s Add SCO error: handle %d status 0x%x", hdev->name, handle, status);
+       BT_DBG("%s handle %d", hdev->name, handle);
 
-                       hci_dev_lock(hdev);
+       hci_dev_lock(hdev);
 
-                       acl = hci_conn_hash_lookup_handle(hdev, handle);
-                       if (acl && (sco = acl->link)) {
-                               sco->state = BT_CLOSED;
+       acl = hci_conn_hash_lookup_handle(hdev, handle);
+       if (acl && (sco = acl->link)) {
+               sco->state = BT_CLOSED;
 
-                               hci_proto_connect_cfm(sco, status);
-                               hci_conn_del(sco);
-                       }
+               hci_proto_connect_cfm(sco, status);
+               hci_conn_del(sco);
+       }
 
-                       hci_dev_unlock(hdev);
-               }
-               break;
+       hci_dev_unlock(hdev);
+}
 
-       case OCF_INQUIRY:
-               if (status) {
-                       BT_DBG("%s Inquiry error: status 0x%x", hdev->name, status);
-                       hci_req_complete(hdev, status);
-               } else {
-                       set_bit(HCI_INQUIRY, &hdev->flags);
-               }
-               break;
+static void hci_cs_remote_name_req(struct hci_dev *hdev, __u8 status)
+{
+       BT_DBG("%s status 0x%x", hdev->name, status);
+}
 
-       default:
-               BT_DBG("%s Command status: ogf LINK_CTL ocf %x status %d",
-                       hdev->name, ocf, status);
-               break;
-       }
+static void hci_cs_setup_sync_conn(struct hci_dev *hdev, __u8 status)
+{
+       BT_DBG("%s status 0x%x", hdev->name, status);
 }
 
-/* Command Status OGF LINK_POLICY */
-static void hci_cs_link_policy(struct hci_dev *hdev, __u16 ocf, __u8 status)
+static void hci_cs_sniff_mode(struct hci_dev *hdev, __u8 status)
 {
-       BT_DBG("%s ocf 0x%x", hdev->name, ocf);
+       struct hci_cp_sniff_mode *cp;
+       struct hci_conn *conn;
 
-       switch (ocf) {
-       case OCF_SNIFF_MODE:
-               if (status) {
-                       struct hci_conn *conn;
-                       struct hci_cp_sniff_mode *cp = hci_sent_cmd_data(hdev, OGF_LINK_POLICY, OCF_SNIFF_MODE);
+       BT_DBG("%s status 0x%x", hdev->name, status);
 
-                       if (!cp)
-                               break;
+       if (!status)
+               return;
 
-                       hci_dev_lock(hdev);
+       cp = hci_sent_cmd_data(hdev, HCI_OP_SNIFF_MODE);
+       if (!cp)
+               return;
 
-                       conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(cp->handle));
-                       if (conn) {
-                               clear_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend);
-                       }
+       hci_dev_lock(hdev);
 
-                       hci_dev_unlock(hdev);
-               }
-               break;
+       conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(cp->handle));
+       if (conn)
+               clear_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend);
 
-       case OCF_EXIT_SNIFF_MODE:
-               if (status) {
-                       struct hci_conn *conn;
-                       struct hci_cp_exit_sniff_mode *cp = hci_sent_cmd_data(hdev, OGF_LINK_POLICY, OCF_EXIT_SNIFF_MODE);
+       hci_dev_unlock(hdev);
+}
 
-                       if (!cp)
-                               break;
+static void hci_cs_exit_sniff_mode(struct hci_dev *hdev, __u8 status)
+{
+       struct hci_cp_exit_sniff_mode *cp;
+       struct hci_conn *conn;
 
-                       hci_dev_lock(hdev);
+       BT_DBG("%s status 0x%x", hdev->name, status);
 
-                       conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(cp->handle));
-                       if (conn) {
-                               clear_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend);
-                       }
+       if (!status)
+               return;
 
-                       hci_dev_unlock(hdev);
-               }
-               break;
+       cp = hci_sent_cmd_data(hdev, HCI_OP_EXIT_SNIFF_MODE);
+       if (!cp)
+               return;
 
-       default:
-               BT_DBG("%s Command status: ogf LINK_POLICY ocf %x", hdev->name, ocf);
-               break;
-       }
-}
-
-/* Command Status OGF HOST_CTL */
-static void hci_cs_host_ctl(struct hci_dev *hdev, __u16 ocf, __u8 status)
-{
-       BT_DBG("%s ocf 0x%x", hdev->name, ocf);
-
-       switch (ocf) {
-       default:
-               BT_DBG("%s Command status: ogf HOST_CTL ocf %x", hdev->name, ocf);
-               break;
-       }
-}
+       hci_dev_lock(hdev);
 
-/* Command Status OGF INFO_PARAM  */
-static void hci_cs_info_param(struct hci_dev *hdev, __u16 ocf, __u8 status)
-{
-       BT_DBG("%s: hci_cs_info_param: ocf 0x%x", hdev->name, ocf);
+       conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(cp->handle));
+       if (conn)
+               clear_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend);
 
-       switch (ocf) {
-       default:
-               BT_DBG("%s Command status: ogf INFO_PARAM ocf %x", hdev->name, ocf);
-               break;
-       }
+       hci_dev_unlock(hdev);
 }
 
-/* Inquiry Complete */
 static inline void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
        __u8 status = *((__u8 *) skb->data);
-       struct hci_conn *pend;
 
        BT_DBG("%s status %d", hdev->name, status);
 
        clear_bit(HCI_INQUIRY, &hdev->flags);
-       hci_req_complete(hdev, status);
-
-       hci_dev_lock(hdev);
 
-       pend = hci_conn_hash_lookup_state(hdev, ACL_LINK, BT_CONNECT2);
-       if (pend)
-               hci_acl_connect(pend);
+       hci_req_complete(hdev, status);
 
-       hci_dev_unlock(hdev);
+       hci_conn_check_pending(hdev);
 }
 
-/* Inquiry Result */
 static inline void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
        struct inquiry_data data;
-       struct inquiry_info *info = (struct inquiry_info *) (skb->data + 1);
+       struct inquiry_info *info = (void *) (skb->data + 1);
        int num_rsp = *((__u8 *) skb->data);
 
        BT_DBG("%s num_rsp %d", hdev->name, num_rsp);
        hci_dev_unlock(hdev);
 }
 
-/* Inquiry Result With RSSI */
-static inline void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, struct sk_buff *skb)
-{
-       struct inquiry_data data;
-       int num_rsp = *((__u8 *) skb->data);
-
-       BT_DBG("%s num_rsp %d", hdev->name, num_rsp);
-
-       if (!num_rsp)
-               return;
-
-       hci_dev_lock(hdev);
-
-       if ((skb->len - 1) / num_rsp != sizeof(struct inquiry_info_with_rssi)) {
-               struct inquiry_info_with_rssi_and_pscan_mode *info =
-                       (struct inquiry_info_with_rssi_and_pscan_mode *) (skb->data + 1);
-
-               for (; num_rsp; num_rsp--) {
-                       bacpy(&data.bdaddr, &info->bdaddr);
-                       data.pscan_rep_mode     = info->pscan_rep_mode;
-                       data.pscan_period_mode  = info->pscan_period_mode;
-                       data.pscan_mode         = info->pscan_mode;
-                       memcpy(data.dev_class, info->dev_class, 3);
-                       data.clock_offset       = info->clock_offset;
-                       data.rssi               = info->rssi;
-                       info++;
-                       hci_inquiry_cache_update(hdev, &data);
-               }
-       } else {
-               struct inquiry_info_with_rssi *info =
-                       (struct inquiry_info_with_rssi *) (skb->data + 1);
-
-               for (; num_rsp; num_rsp--) {
-                       bacpy(&data.bdaddr, &info->bdaddr);
-                       data.pscan_rep_mode     = info->pscan_rep_mode;
-                       data.pscan_period_mode  = info->pscan_period_mode;
-                       data.pscan_mode         = 0x00;
-                       memcpy(data.dev_class, info->dev_class, 3);
-                       data.clock_offset       = info->clock_offset;
-                       data.rssi               = info->rssi;
-                       info++;
-                       hci_inquiry_cache_update(hdev, &data);
-               }
-       }
-
-       hci_dev_unlock(hdev);
-}
-
-/* Extended Inquiry Result */
-static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb)
-{
-       struct inquiry_data data;
-       struct extended_inquiry_info *info = (struct extended_inquiry_info *) (skb->data + 1);
-       int num_rsp = *((__u8 *) skb->data);
-
-       BT_DBG("%s num_rsp %d", hdev->name, num_rsp);
-
-       if (!num_rsp)
-               return;
-
-       hci_dev_lock(hdev);
-
-       for (; num_rsp; num_rsp--) {
-               bacpy(&data.bdaddr, &info->bdaddr);
-               data.pscan_rep_mode     = info->pscan_rep_mode;
-               data.pscan_period_mode  = info->pscan_period_mode;
-               data.pscan_mode         = 0x00;
-               memcpy(data.dev_class, info->dev_class, 3);
-               data.clock_offset       = info->clock_offset;
-               data.rssi               = info->rssi;
-               info++;
-               hci_inquiry_cache_update(hdev, &data);
-       }
-
-       hci_dev_unlock(hdev);
-}
-
-/* Connect Request */
-static inline void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
-{
-       struct hci_ev_conn_request *ev = (struct hci_ev_conn_request *) skb->data;
-       int mask = hdev->link_mode;
-
-       BT_DBG("%s Connection request: %s type 0x%x", hdev->name,
-                       batostr(&ev->bdaddr), ev->link_type);
-
-       mask |= hci_proto_connect_ind(hdev, &ev->bdaddr, ev->link_type);
-
-       if (mask & HCI_LM_ACCEPT) {
-               /* Connection accepted */
-               struct hci_conn *conn;
-               struct hci_cp_accept_conn_req cp;
-
-               hci_dev_lock(hdev);
-               conn = hci_conn_hash_lookup_ba(hdev, ev->link_type, &ev->bdaddr);
-               if (!conn) {
-                       if (!(conn = hci_conn_add(hdev, ev->link_type, &ev->bdaddr))) {
-                               BT_ERR("No memmory for new connection");
-                               hci_dev_unlock(hdev);
-                               return;
-                       }
-               }
-               memcpy(conn->dev_class, ev->dev_class, 3);
-               conn->state = BT_CONNECT;
-               hci_dev_unlock(hdev);
-
-               bacpy(&cp.bdaddr, &ev->bdaddr);
-
-               if (lmp_rswitch_capable(hdev) && (mask & HCI_LM_MASTER))
-                       cp.role = 0x00; /* Become master */
-               else
-                       cp.role = 0x01; /* Remain slave */
-
-               hci_send_cmd(hdev, OGF_LINK_CTL,
-                               OCF_ACCEPT_CONN_REQ, sizeof(cp), &cp);
-       } else {
-               /* Connection rejected */
-               struct hci_cp_reject_conn_req cp;
-
-               bacpy(&cp.bdaddr, &ev->bdaddr);
-               cp.reason = 0x0f;
-               hci_send_cmd(hdev, OGF_LINK_CTL,
-                               OCF_REJECT_CONN_REQ, sizeof(cp), &cp);
-       }
-}
-
-/* Connect Complete */
 static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
-       struct hci_ev_conn_complete *ev = (struct hci_ev_conn_complete *) skb->data;
-       struct hci_conn *conn, *pend;
+       struct hci_ev_conn_complete *ev = (void *) skb->data;
+       struct hci_conn *conn;
 
        BT_DBG("%s", hdev->name);
 
        hci_dev_lock(hdev);
 
        conn = hci_conn_hash_lookup_ba(hdev, ev->link_type, &ev->bdaddr);
-       if (!conn) {
-               hci_dev_unlock(hdev);
-               return;
-       }
+       if (!conn)
+               goto unlock;
 
        if (!ev->status) {
                conn->handle = __le16_to_cpu(ev->handle);
                if (conn->type == ACL_LINK) {
                        struct hci_cp_read_remote_features cp;
                        cp.handle = ev->handle;
-                       hci_send_cmd(hdev, OGF_LINK_CTL,
-                               OCF_READ_REMOTE_FEATURES, sizeof(cp), &cp);
+                       hci_send_cmd(hdev, HCI_OP_READ_REMOTE_FEATURES, sizeof(cp), &cp);
                }
 
                /* Set link policy */
                        struct hci_cp_write_link_policy cp;
                        cp.handle = ev->handle;
                        cp.policy = cpu_to_le16(hdev->link_policy);
-                       hci_send_cmd(hdev, OGF_LINK_POLICY,
-                               OCF_WRITE_LINK_POLICY, sizeof(cp), &cp);
+                       hci_send_cmd(hdev, HCI_OP_WRITE_LINK_POLICY, sizeof(cp), &cp);
                }
 
                /* Set packet type for incoming connection */
                                cpu_to_le16(hdev->pkt_type & ACL_PTYPE_MASK):
                                cpu_to_le16(hdev->pkt_type & SCO_PTYPE_MASK);
 
-                       hci_send_cmd(hdev, OGF_LINK_CTL,
-                               OCF_CHANGE_CONN_PTYPE, sizeof(cp), &cp);
+                       hci_send_cmd(hdev, HCI_OP_CHANGE_CONN_PTYPE, sizeof(cp), &cp);
                } else {
                        /* Update disconnect timer */
                        hci_conn_hold(conn);
        if (ev->status)
                hci_conn_del(conn);
 
-       pend = hci_conn_hash_lookup_state(hdev, ACL_LINK, BT_CONNECT2);
-       if (pend)
-               hci_acl_connect(pend);
-
+unlock:
        hci_dev_unlock(hdev);
-}
-
-/* Disconnect Complete */
-static inline void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
-{
-       struct hci_ev_disconn_complete *ev = (struct hci_ev_disconn_complete *) skb->data;
-       struct hci_conn *conn;
-
-       BT_DBG("%s status %d", hdev->name, ev->status);
-
-       if (ev->status)
-               return;
-
-       hci_dev_lock(hdev);
-
-       conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle));
-       if (conn) {
-               conn->state = BT_CLOSED;
-               hci_proto_disconn_ind(conn, ev->reason);
-               hci_conn_del(conn);
-       }
 
-       hci_dev_unlock(hdev);
+       hci_conn_check_pending(hdev);
 }
 
-/* Number of completed packets */
-static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static inline void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
-       struct hci_ev_num_comp_pkts *ev = (struct hci_ev_num_comp_pkts *) skb->data;
-       __le16 *ptr;
-       int i;
-
-       skb_pull(skb, sizeof(*ev));
-
-       BT_DBG("%s num_hndl %d", hdev->name, ev->num_hndl);
+       struct hci_ev_conn_request *ev = (void *) skb->data;
+       int mask = hdev->link_mode;
 
-       if (skb->len < ev->num_hndl * 4) {
-               BT_DBG("%s bad parameters", hdev->name);
-               return;
-       }
+       BT_DBG("%s bdaddr %s type 0x%x", hdev->name,
+                                       batostr(&ev->bdaddr), ev->link_type);
 
-       tasklet_disable(&hdev->tx_task);
+       mask |= hci_proto_connect_ind(hdev, &ev->bdaddr, ev->link_type);
 
-       for (i = 0, ptr = (__le16 *) skb->data; i < ev->num_hndl; i++) {
+       if (mask & HCI_LM_ACCEPT) {
+               /* Connection accepted */
                struct hci_conn *conn;
-               __u16  handle, count;
-
-               handle = __le16_to_cpu(get_unaligned(ptr++));
-               count  = __le16_to_cpu(get_unaligned(ptr++));
-
-               conn = hci_conn_hash_lookup_handle(hdev, handle);
-               if (conn) {
-                       conn->sent -= count;
+               struct hci_cp_accept_conn_req cp;
 
-                       if (conn->type == ACL_LINK) {
-                               if ((hdev->acl_cnt += count) > hdev->acl_pkts)
-                                       hdev->acl_cnt = hdev->acl_pkts;
-                       } else {
-                               if ((hdev->sco_cnt += count) > hdev->sco_pkts)
-                                       hdev->sco_cnt = hdev->sco_pkts;
+               hci_dev_lock(hdev);
+               conn = hci_conn_hash_lookup_ba(hdev, ev->link_type, &ev->bdaddr);
+               if (!conn) {
+                       if (!(conn = hci_conn_add(hdev, ev->link_type, &ev->bdaddr))) {
+                               BT_ERR("No memmory for new connection");
+                               hci_dev_unlock(hdev);
+                               return;
                        }
                }
-       }
-       hci_sched_tx(hdev);
-
-       tasklet_enable(&hdev->tx_task);
-}
-
-/* Role Change */
-static inline void hci_role_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
-{
-       struct hci_ev_role_change *ev = (struct hci_ev_role_change *) skb->data;
-       struct hci_conn *conn;
-
-       BT_DBG("%s status %d", hdev->name, ev->status);
+               memcpy(conn->dev_class, ev->dev_class, 3);
+               conn->state = BT_CONNECT;
+               hci_dev_unlock(hdev);
 
-       hci_dev_lock(hdev);
+               bacpy(&cp.bdaddr, &ev->bdaddr);
 
-       conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr);
-       if (conn) {
-               if (!ev->status) {
-                       if (ev->role)
-                               conn->link_mode &= ~HCI_LM_MASTER;
-                       else
-                               conn->link_mode |= HCI_LM_MASTER;
-               }
+               if (lmp_rswitch_capable(hdev) && (mask & HCI_LM_MASTER))
+                       cp.role = 0x00; /* Become master */
+               else
+                       cp.role = 0x01; /* Remain slave */
 
-               clear_bit(HCI_CONN_RSWITCH_PEND, &conn->pend);
+               hci_send_cmd(hdev, HCI_OP_ACCEPT_CONN_REQ, sizeof(cp), &cp);
+       } else {
+               /* Connection rejected */
+               struct hci_cp_reject_conn_req cp;
 
-               hci_role_switch_cfm(conn, ev->status, ev->role);
+               bacpy(&cp.bdaddr, &ev->bdaddr);
+               cp.reason = 0x0f;
+               hci_send_cmd(hdev, HCI_OP_REJECT_CONN_REQ, sizeof(cp), &cp);
        }
-
-       hci_dev_unlock(hdev);
 }
 
-/* Mode Change */
-static inline void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static inline void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
-       struct hci_ev_mode_change *ev = (struct hci_ev_mode_change *) skb->data;
+       struct hci_ev_disconn_complete *ev = (void *) skb->data;
        struct hci_conn *conn;
 
        BT_DBG("%s status %d", hdev->name, ev->status);
 
+       if (ev->status)
+               return;
+
        hci_dev_lock(hdev);
 
        conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle));
        if (conn) {
-               conn->mode = ev->mode;
-               conn->interval = __le16_to_cpu(ev->interval);
-
-               if (!test_and_clear_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend)) {
-                       if (conn->mode == HCI_CM_ACTIVE)
-                               conn->power_save = 1;
-                       else
-                               conn->power_save = 0;
-               }
+               conn->state = BT_CLOSED;
+               hci_proto_disconn_ind(conn, ev->reason);
+               hci_conn_del(conn);
        }
 
        hci_dev_unlock(hdev);
 }
 
-/* Authentication Complete */
 static inline void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
-       struct hci_ev_auth_complete *ev = (struct hci_ev_auth_complete *) skb->data;
+       struct hci_ev_auth_complete *ev = (void *) skb->data;
        struct hci_conn *conn;
 
        BT_DBG("%s status %d", hdev->name, ev->status);
                                struct hci_cp_set_conn_encrypt cp;
                                cp.handle  = cpu_to_le16(conn->handle);
                                cp.encrypt = 1;
-                               hci_send_cmd(conn->hdev, OGF_LINK_CTL,
-                                       OCF_SET_CONN_ENCRYPT, sizeof(cp), &cp);
+                               hci_send_cmd(conn->hdev,
+                                       HCI_OP_SET_CONN_ENCRYPT, sizeof(cp), &cp);
                        } else {
                                clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend);
                                hci_encrypt_cfm(conn, ev->status, 0x00);
        hci_dev_unlock(hdev);
 }
 
-/* Encryption Change */
-static inline void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static inline void hci_remote_name_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
-       struct hci_ev_encrypt_change *ev = (struct hci_ev_encrypt_change *) skb->data;
-       struct hci_conn *conn;
+       BT_DBG("%s", hdev->name);
 
-       BT_DBG("%s status %d", hdev->name, ev->status);
+       hci_conn_check_pending(hdev);
+}
+
+static inline void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       struct hci_ev_encrypt_change *ev = (void *) skb->data;
+       struct hci_conn *conn;
+
+       BT_DBG("%s status %d", hdev->name, ev->status);
 
        hci_dev_lock(hdev);
 
        hci_dev_unlock(hdev);
 }
 
-/* Change Connection Link Key Complete */
-static inline void hci_change_conn_link_key_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static inline void hci_change_link_key_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
-       struct hci_ev_change_conn_link_key_complete *ev = (struct hci_ev_change_conn_link_key_complete *) skb->data;
+       struct hci_ev_change_link_key_complete *ev = (void *) skb->data;
        struct hci_conn *conn;
 
        BT_DBG("%s status %d", hdev->name, ev->status);
        hci_dev_unlock(hdev);
 }
 
-/* Pin Code Request*/
-static inline void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static inline void hci_remote_features_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
+       struct hci_ev_remote_features *ev = (void *) skb->data;
+       struct hci_conn *conn;
+
+       BT_DBG("%s status %d", hdev->name, ev->status);
+
+       if (ev->status)
+               return;
+
+       hci_dev_lock(hdev);
+
+       conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle));
+       if (conn)
+               memcpy(conn->features, ev->features, 8);
+
+       hci_dev_unlock(hdev);
 }
 
-/* Link Key Request */
-static inline void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static inline void hci_remote_version_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
+       BT_DBG("%s", hdev->name);
 }
 
-/* Link Key Notification */
-static inline void hci_link_key_notify_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static inline void hci_qos_setup_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
+       BT_DBG("%s", hdev->name);
 }
 
-/* Remote Features */
-static inline void hci_remote_features_evt(struct hci_dev *hdev, struct sk_buff *skb)
+static inline void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       struct hci_ev_cmd_complete *ev = (void *) skb->data;
+       __u16 opcode;
+
+       skb_pull(skb, sizeof(*ev));
+
+       opcode = __le16_to_cpu(ev->opcode);
+
+       switch (opcode) {
+       case HCI_OP_INQUIRY_CANCEL:
+               hci_cc_inquiry_cancel(hdev, skb);
+               break;
+
+       case HCI_OP_EXIT_PERIODIC_INQ:
+               hci_cc_exit_periodic_inq(hdev, skb);
+               break;
+
+       case HCI_OP_REMOTE_NAME_REQ_CANCEL:
+               hci_cc_remote_name_req_cancel(hdev, skb);
+               break;
+
+       case HCI_OP_ROLE_DISCOVERY:
+               hci_cc_role_discovery(hdev, skb);
+               break;
+
+       case HCI_OP_WRITE_LINK_POLICY:
+               hci_cc_write_link_policy(hdev, skb);
+               break;
+
+       case HCI_OP_RESET:
+               hci_cc_reset(hdev, skb);
+               break;
+
+       case HCI_OP_WRITE_LOCAL_NAME:
+               hci_cc_write_local_name(hdev, skb);
+               break;
+
+       case HCI_OP_READ_LOCAL_NAME:
+               hci_cc_read_local_name(hdev, skb);
+               break;
+
+       case HCI_OP_WRITE_AUTH_ENABLE:
+               hci_cc_write_auth_enable(hdev, skb);
+               break;
+
+       case HCI_OP_WRITE_ENCRYPT_MODE:
+               hci_cc_write_encrypt_mode(hdev, skb);
+               break;
+
+       case HCI_OP_WRITE_SCAN_ENABLE:
+               hci_cc_write_scan_enable(hdev, skb);
+               break;
+
+       case HCI_OP_READ_CLASS_OF_DEV:
+               hci_cc_read_class_of_dev(hdev, skb);
+               break;
+
+       case HCI_OP_WRITE_CLASS_OF_DEV:
+               hci_cc_write_class_of_dev(hdev, skb);
+               break;
+
+       case HCI_OP_READ_VOICE_SETTING:
+               hci_cc_read_voice_setting(hdev, skb);
+               break;
+
+       case HCI_OP_WRITE_VOICE_SETTING:
+               hci_cc_write_voice_setting(hdev, skb);
+               break;
+
+       case HCI_OP_HOST_BUFFER_SIZE:
+               hci_cc_host_buffer_size(hdev, skb);
+               break;
+
+       case HCI_OP_READ_LOCAL_VERSION:
+               hci_cc_read_local_version(hdev, skb);
+               break;
+
+       case HCI_OP_READ_LOCAL_COMMANDS:
+               hci_cc_read_local_commands(hdev, skb);
+               break;
+
+       case HCI_OP_READ_LOCAL_FEATURES:
+               hci_cc_read_local_features(hdev, skb);
+               break;
+
+       case HCI_OP_READ_BUFFER_SIZE:
+               hci_cc_read_buffer_size(hdev, skb);
+               break;
+
+       case HCI_OP_READ_BD_ADDR:
+               hci_cc_read_bd_addr(hdev, skb);
+               break;
+
+       default:
+               BT_DBG("%s opcode 0x%x", hdev->name, opcode);
+               break;
+       }
+
+       if (ev->ncmd) {
+               atomic_set(&hdev->cmd_cnt, 1);
+               if (!skb_queue_empty(&hdev->cmd_q))
+                       hci_sched_cmd(hdev);
+       }
+}
+
+static inline void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       struct hci_ev_cmd_status *ev = (void *) skb->data;
+       __u16 opcode;
+
+       skb_pull(skb, sizeof(*ev));
+
+       opcode = __le16_to_cpu(ev->opcode);
+
+       switch (opcode) {
+       case HCI_OP_INQUIRY:
+               hci_cs_inquiry(hdev, ev->status);
+               break;
+
+       case HCI_OP_CREATE_CONN:
+               hci_cs_create_conn(hdev, ev->status);
+               break;
+
+       case HCI_OP_ADD_SCO:
+               hci_cs_add_sco(hdev, ev->status);
+               break;
+
+       case HCI_OP_REMOTE_NAME_REQ:
+               hci_cs_remote_name_req(hdev, ev->status);
+               break;
+
+       case HCI_OP_SETUP_SYNC_CONN:
+               hci_cs_setup_sync_conn(hdev, ev->status);
+               break;
+
+       case HCI_OP_SNIFF_MODE:
+               hci_cs_sniff_mode(hdev, ev->status);
+               break;
+
+       case HCI_OP_EXIT_SNIFF_MODE:
+               hci_cs_exit_sniff_mode(hdev, ev->status);
+               break;
+
+       default:
+               BT_DBG("%s opcode 0x%x", hdev->name, opcode);
+               break;
+       }
+
+       if (ev->ncmd) {
+               atomic_set(&hdev->cmd_cnt, 1);
+               if (!skb_queue_empty(&hdev->cmd_q))
+                       hci_sched_cmd(hdev);
+       }
+}
+
+static inline void hci_role_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       struct hci_ev_role_change *ev = (void *) skb->data;
+       struct hci_conn *conn;
+
+       BT_DBG("%s status %d", hdev->name, ev->status);
+
+       hci_dev_lock(hdev);
+
+       conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr);
+       if (conn) {
+               if (!ev->status) {
+                       if (ev->role)
+                               conn->link_mode &= ~HCI_LM_MASTER;
+                       else
+                               conn->link_mode |= HCI_LM_MASTER;
+               }
+
+               clear_bit(HCI_CONN_RSWITCH_PEND, &conn->pend);
+
+               hci_role_switch_cfm(conn, ev->status, ev->role);
+       }
+
+       hci_dev_unlock(hdev);
+}
+
+static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       struct hci_ev_num_comp_pkts *ev = (void *) skb->data;
+       __le16 *ptr;
+       int i;
+
+       skb_pull(skb, sizeof(*ev));
+
+       BT_DBG("%s num_hndl %d", hdev->name, ev->num_hndl);
+
+       if (skb->len < ev->num_hndl * 4) {
+               BT_DBG("%s bad parameters", hdev->name);
+               return;
+       }
+
+       tasklet_disable(&hdev->tx_task);
+
+       for (i = 0, ptr = (__le16 *) skb->data; i < ev->num_hndl; i++) {
+               struct hci_conn *conn;
+               __u16  handle, count;
+
+               handle = __le16_to_cpu(get_unaligned(ptr++));
+               count  = __le16_to_cpu(get_unaligned(ptr++));
+
+               conn = hci_conn_hash_lookup_handle(hdev, handle);
+               if (conn) {
+                       conn->sent -= count;
+
+                       if (conn->type == ACL_LINK) {
+                               if ((hdev->acl_cnt += count) > hdev->acl_pkts)
+                                       hdev->acl_cnt = hdev->acl_pkts;
+                       } else {
+                               if ((hdev->sco_cnt += count) > hdev->sco_pkts)
+                                       hdev->sco_cnt = hdev->sco_pkts;
+                       }
+               }
+       }
+
+       hci_sched_tx(hdev);
+
+       tasklet_enable(&hdev->tx_task);
+}
+
+static inline void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
-       struct hci_ev_remote_features *ev = (struct hci_ev_remote_features *) skb->data;
+       struct hci_ev_mode_change *ev = (void *) skb->data;
        struct hci_conn *conn;
 
        BT_DBG("%s status %d", hdev->name, ev->status);
        hci_dev_lock(hdev);
 
        conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle));
-       if (conn && !ev->status) {
-               memcpy(conn->features, ev->features, sizeof(conn->features));
+       if (conn) {
+               conn->mode = ev->mode;
+               conn->interval = __le16_to_cpu(ev->interval);
+
+               if (!test_and_clear_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend)) {
+                       if (conn->mode == HCI_CM_ACTIVE)
+                               conn->power_save = 1;
+                       else
+                               conn->power_save = 0;
+               }
        }
 
        hci_dev_unlock(hdev);
 }
 
-/* Clock Offset */
+static inline void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       BT_DBG("%s", hdev->name);
+}
+
+static inline void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       BT_DBG("%s", hdev->name);
+}
+
+static inline void hci_link_key_notify_evt(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       BT_DBG("%s", hdev->name);
+}
+
 static inline void hci_clock_offset_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
-       struct hci_ev_clock_offset *ev = (struct hci_ev_clock_offset *) skb->data;
+       struct hci_ev_clock_offset *ev = (void *) skb->data;
        struct hci_conn *conn;
 
        BT_DBG("%s status %d", hdev->name, ev->status);
        hci_dev_unlock(hdev);
 }
 
-/* Page Scan Repetition Mode */
 static inline void hci_pscan_rep_mode_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
-       struct hci_ev_pscan_rep_mode *ev = (struct hci_ev_pscan_rep_mode *) skb->data;
+       struct hci_ev_pscan_rep_mode *ev = (void *) skb->data;
        struct inquiry_entry *ie;
 
        BT_DBG("%s", hdev->name);
        hci_dev_unlock(hdev);
 }
 
-/* Sniff Subrate */
+static inline void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       struct inquiry_data data;
+       int num_rsp = *((__u8 *) skb->data);
+
+       BT_DBG("%s num_rsp %d", hdev->name, num_rsp);
+
+       if (!num_rsp)
+               return;
+
+       hci_dev_lock(hdev);
+
+       if ((skb->len - 1) / num_rsp != sizeof(struct inquiry_info_with_rssi)) {
+               struct inquiry_info_with_rssi_and_pscan_mode *info = (void *) (skb->data + 1);
+
+               for (; num_rsp; num_rsp--) {
+                       bacpy(&data.bdaddr, &info->bdaddr);
+                       data.pscan_rep_mode     = info->pscan_rep_mode;
+                       data.pscan_period_mode  = info->pscan_period_mode;
+                       data.pscan_mode         = info->pscan_mode;
+                       memcpy(data.dev_class, info->dev_class, 3);
+                       data.clock_offset       = info->clock_offset;
+                       data.rssi               = info->rssi;
+                       info++;
+                       hci_inquiry_cache_update(hdev, &data);
+               }
+       } else {
+               struct inquiry_info_with_rssi *info = (void *) (skb->data + 1);
+
+               for (; num_rsp; num_rsp--) {
+                       bacpy(&data.bdaddr, &info->bdaddr);
+                       data.pscan_rep_mode     = info->pscan_rep_mode;
+                       data.pscan_period_mode  = info->pscan_period_mode;
+                       data.pscan_mode         = 0x00;
+                       memcpy(data.dev_class, info->dev_class, 3);
+                       data.clock_offset       = info->clock_offset;
+                       data.rssi               = info->rssi;
+                       info++;
+                       hci_inquiry_cache_update(hdev, &data);
+               }
+       }
+
+       hci_dev_unlock(hdev);
+}
+
+static inline void hci_remote_ext_features_evt(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       BT_DBG("%s", hdev->name);
+}
+
+static inline void hci_sync_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       BT_DBG("%s", hdev->name);
+}
+
+static inline void hci_sync_conn_changed_evt(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       BT_DBG("%s", hdev->name);
+}
+
 static inline void hci_sniff_subrate_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
-       struct hci_ev_sniff_subrate *ev = (struct hci_ev_sniff_subrate *) skb->data;
+       struct hci_ev_sniff_subrate *ev = (void *) skb->data;
        struct hci_conn *conn;
 
        BT_DBG("%s status %d", hdev->name, ev->status);
        hci_dev_unlock(hdev);
 }
 
-void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb)
+static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
-       struct hci_event_hdr *hdr = (struct hci_event_hdr *) skb->data;
-       struct hci_ev_cmd_complete *ec;
-       struct hci_ev_cmd_status *cs;
-       u16 opcode, ocf, ogf;
+       struct inquiry_data data;
+       struct extended_inquiry_info *info = (void *) (skb->data + 1);
+       int num_rsp = *((__u8 *) skb->data);
 
-       skb_pull(skb, HCI_EVENT_HDR_SIZE);
+       BT_DBG("%s num_rsp %d", hdev->name, num_rsp);
 
-       BT_DBG("%s evt 0x%x", hdev->name, hdr->evt);
+       if (!num_rsp)
+               return;
 
-       switch (hdr->evt) {
-       case HCI_EV_NUM_COMP_PKTS:
-               hci_num_comp_pkts_evt(hdev, skb);
-               break;
+       hci_dev_lock(hdev);
+
+       for (; num_rsp; num_rsp--) {
+               bacpy(&data.bdaddr, &info->bdaddr);
+               data.pscan_rep_mode     = info->pscan_rep_mode;
+               data.pscan_period_mode  = info->pscan_period_mode;
+               data.pscan_mode         = 0x00;
+               memcpy(data.dev_class, info->dev_class, 3);
+               data.clock_offset       = info->clock_offset;
+               data.rssi               = info->rssi;
+               info++;
+               hci_inquiry_cache_update(hdev, &data);
+       }
+
+       hci_dev_unlock(hdev);
+}
 
+void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       struct hci_event_hdr *hdr = (void *) skb->data;
+       __u8 event = hdr->evt;
+
+       skb_pull(skb, HCI_EVENT_HDR_SIZE);
+
+       switch (event) {
        case HCI_EV_INQUIRY_COMPLETE:
                hci_inquiry_complete_evt(hdev, skb);
                break;
                hci_inquiry_result_evt(hdev, skb);
                break;
 
-       case HCI_EV_INQUIRY_RESULT_WITH_RSSI:
-               hci_inquiry_result_with_rssi_evt(hdev, skb);
-               break;
-
-       case HCI_EV_EXTENDED_INQUIRY_RESULT:
-               hci_extended_inquiry_result_evt(hdev, skb);
+       case HCI_EV_CONN_COMPLETE:
+               hci_conn_complete_evt(hdev, skb);
                break;
 
        case HCI_EV_CONN_REQUEST:
                hci_conn_request_evt(hdev, skb);
                break;
 
-       case HCI_EV_CONN_COMPLETE:
-               hci_conn_complete_evt(hdev, skb);
-               break;
-
        case HCI_EV_DISCONN_COMPLETE:
                hci_disconn_complete_evt(hdev, skb);
                break;
 
-       case HCI_EV_ROLE_CHANGE:
-               hci_role_change_evt(hdev, skb);
-               break;
-
-       case HCI_EV_MODE_CHANGE:
-               hci_mode_change_evt(hdev, skb);
-               break;
-
        case HCI_EV_AUTH_COMPLETE:
                hci_auth_complete_evt(hdev, skb);
                break;
 
+       case HCI_EV_REMOTE_NAME:
+               hci_remote_name_evt(hdev, skb);
+               break;
+
        case HCI_EV_ENCRYPT_CHANGE:
                hci_encrypt_change_evt(hdev, skb);
                break;
 
-       case HCI_EV_CHANGE_CONN_LINK_KEY_COMPLETE:
-               hci_change_conn_link_key_complete_evt(hdev, skb);
+       case HCI_EV_CHANGE_LINK_KEY_COMPLETE:
+               hci_change_link_key_complete_evt(hdev, skb);
+               break;
+
+       case HCI_EV_REMOTE_FEATURES:
+               hci_remote_features_evt(hdev, skb);
+               break;
+
+       case HCI_EV_REMOTE_VERSION:
+               hci_remote_version_evt(hdev, skb);
+               break;
+
+       case HCI_EV_QOS_SETUP_COMPLETE:
+               hci_qos_setup_complete_evt(hdev, skb);
+               break;
+
+       case HCI_EV_CMD_COMPLETE:
+               hci_cmd_complete_evt(hdev, skb);
+               break;
+
+       case HCI_EV_CMD_STATUS:
+               hci_cmd_status_evt(hdev, skb);
+               break;
+
+       case HCI_EV_ROLE_CHANGE:
+               hci_role_change_evt(hdev, skb);
+               break;
+
+       case HCI_EV_NUM_COMP_PKTS:
+               hci_num_comp_pkts_evt(hdev, skb);
+               break;
+
+       case HCI_EV_MODE_CHANGE:
+               hci_mode_change_evt(hdev, skb);
                break;
 
        case HCI_EV_PIN_CODE_REQ:
                hci_link_key_notify_evt(hdev, skb);
                break;
 
-       case HCI_EV_REMOTE_FEATURES:
-               hci_remote_features_evt(hdev, skb);
-               break;
-
        case HCI_EV_CLOCK_OFFSET:
                hci_clock_offset_evt(hdev, skb);
                break;
                hci_pscan_rep_mode_evt(hdev, skb);
                break;
 
-       case HCI_EV_SNIFF_SUBRATE:
-               hci_sniff_subrate_evt(hdev, skb);
+       case HCI_EV_INQUIRY_RESULT_WITH_RSSI:
+               hci_inquiry_result_with_rssi_evt(hdev, skb);
                break;
 
-       case HCI_EV_CMD_STATUS:
-               cs = (struct hci_ev_cmd_status *) skb->data;
-               skb_pull(skb, sizeof(cs));
-
-               opcode = __le16_to_cpu(cs->opcode);
-               ogf = hci_opcode_ogf(opcode);
-               ocf = hci_opcode_ocf(opcode);
-
-               switch (ogf) {
-               case OGF_INFO_PARAM:
-                       hci_cs_info_param(hdev, ocf, cs->status);
-                       break;
-
-               case OGF_HOST_CTL:
-                       hci_cs_host_ctl(hdev, ocf, cs->status);
-                       break;
-
-               case OGF_LINK_CTL:
-                       hci_cs_link_ctl(hdev, ocf, cs->status);
-                       break;
-
-               case OGF_LINK_POLICY:
-                       hci_cs_link_policy(hdev, ocf, cs->status);
-                       break;
-
-               default:
-                       BT_DBG("%s Command Status OGF %x", hdev->name, ogf);
-                       break;
-               }
-
-               if (cs->ncmd) {
-                       atomic_set(&hdev->cmd_cnt, 1);
-                       if (!skb_queue_empty(&hdev->cmd_q))
-                               hci_sched_cmd(hdev);
-               }
+       case HCI_EV_REMOTE_EXT_FEATURES:
+               hci_remote_ext_features_evt(hdev, skb);
                break;
 
-       case HCI_EV_CMD_COMPLETE:
-               ec = (struct hci_ev_cmd_complete *) skb->data;
-               skb_pull(skb, sizeof(*ec));
-
-               opcode = __le16_to_cpu(ec->opcode);
-               ogf = hci_opcode_ogf(opcode);
-               ocf = hci_opcode_ocf(opcode);
-
-               switch (ogf) {
-               case OGF_INFO_PARAM:
-                       hci_cc_info_param(hdev, ocf, skb);
-                       break;
-
-               case OGF_HOST_CTL:
-                       hci_cc_host_ctl(hdev, ocf, skb);
-                       break;
+       case HCI_EV_SYNC_CONN_COMPLETE:
+               hci_sync_conn_complete_evt(hdev, skb);
+               break;
 
-               case OGF_LINK_CTL:
-                       hci_cc_link_ctl(hdev, ocf, skb);
-                       break;
+       case HCI_EV_SYNC_CONN_CHANGED:
+               hci_sync_conn_changed_evt(hdev, skb);
+               break;
 
-               case OGF_LINK_POLICY:
-                       hci_cc_link_policy(hdev, ocf, skb);
-                       break;
+       case HCI_EV_SNIFF_SUBRATE:
+               hci_sniff_subrate_evt(hdev, skb);
+               break;
 
-               default:
-                       BT_DBG("%s Command Completed OGF %x", hdev->name, ogf);
-                       break;
-               }
+       case HCI_EV_EXTENDED_INQUIRY_RESULT:
+               hci_extended_inquiry_result_evt(hdev, skb);
+               break;
 
-               if (ec->ncmd) {
-                       atomic_set(&hdev->cmd_cnt, 1);
-                       if (!skb_queue_empty(&hdev->cmd_q))
-                               hci_sched_cmd(hdev);
-               }
+       default:
+               BT_DBG("%s event 0x%x", hdev->name, event);
                break;
        }