--- include/net/bluetooth/hci_core.h

+++ include/net/bluetooth/hci_core.h

@@ -326,15 +326,12 @@ void hci_acl_disconn(struct hci_conn *co

void hci_add_sco(struct hci_conn *conn, __u16 handle);

void hci_setup_sync(struct hci_conn *conn, __u16 handle);

-struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type,

- __u16 pkt_type, bdaddr_t *dst);

+struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst);

int hci_conn_del(struct hci_conn *conn);

void hci_conn_hash_flush(struct hci_dev *hdev);

void hci_conn_check_pending(struct hci_dev *hdev);

-struct hci_conn *hci_connect(struct hci_dev *hdev, int type,

- __u16 pkt_type, bdaddr_t *dst,

- __u8 sec_level, __u8 auth_type);

+struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8 sec_level, __u8 auth_type);

int hci_conn_check_link_mode(struct hci_conn *conn);

int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type);

int hci_conn_change_link_key(struct hci_conn *conn);

@@ -361,7 +358,7 @@ static inline void hci_conn_put(struct h

if (conn->state == BT_CONNECTED) {

timeo = msecs_to_jiffies(conn->disc_timeout);

if (!conn->out)

- timeo *= 20;

+ timeo *= 2;

} else

timeo = msecs_to_jiffies(10);

} else

@@ -479,7 +476,6 @@ void hci_conn_del_sysfs(struct hci_conn

#define lmp_sniffsubr_capable(dev) ((dev)->features[5] & LMP_SNIFF_SUBR)

#define lmp_esco_capable(dev) ((dev)->features[3] & LMP_ESCO)

#define lmp_ssp_capable(dev) ((dev)->features[6] & LMP_SIMPLE_PAIR)

-#define lmp_no_flush_capable(dev) ((dev)->features[6] & LMP_NO_FLUSH)

/* ----- HCI protocols ----- */

struct hci_proto {