3 files changed, 48 insertions, 35 deletions

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 63980bd6b5f2..5fdfc9a67d39 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -123,8 +123,8 @@ void hci_add_sco(struct hci_conn *conn, __u16 handle)
         conn->state = BT_CONNECT;
         conn->out = 1;
 
-        cp.pkt_type = cpu_to_le16(hdev->pkt_type & SCO_PTYPE_MASK);
         cp.handle   = cpu_to_le16(handle);
+        cp.pkt_type = cpu_to_le16(hdev->pkt_type & SCO_PTYPE_MASK);
 
         hci_send_cmd(hdev, OGF_LINK_CTL, OCF_ADD_SCO, sizeof(cp), &cp);
 }
@@ -220,19 +220,19 @@ int hci_conn_del(struct hci_conn *conn)
 
         del_timer(&conn->disc_timer);
 
-        if (conn->type == SCO_LINK) {
-                struct hci_conn *acl = conn->link;
-                if (acl) {
-                        acl->link = NULL;
-                        hci_conn_put(acl);
-                }
-        } else {
+        if (conn->type == ACL_LINK) {
                 struct hci_conn *sco = conn->link;
                 if (sco)
                         sco->link = NULL;
 
                 /* Unacked frames */
                 hdev->acl_cnt += conn->sent;
+        } else {
+                struct hci_conn *acl = conn->link;
+                if (acl) {
+                        acl->link = NULL;
+                        hci_conn_put(acl);
+                }
         }
 
         tasklet_disable(&hdev->tx_task);
@@ -297,9 +297,10 @@ EXPORT_SYMBOL(hci_get_route);
 
 /* Create SCO or ACL connection.
  * Device _must_ be locked */
-struct hci_conn * hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst)
+struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst)
 {
         struct hci_conn *acl;
+        struct hci_conn *sco;
 
         BT_DBG("%s dst %s", hdev->name, batostr(dst));
 
@@ -313,28 +314,26 @@ struct hci_conn * hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst)
         if (acl->state == BT_OPEN || acl->state == BT_CLOSED)
                 hci_acl_connect(acl);
 
-        if (type == SCO_LINK) {
-                struct hci_conn *sco;
+        if (type == ACL_LINK)
+                return acl;
 
-                if (!(sco = hci_conn_hash_lookup_ba(hdev, SCO_LINK, dst))) {
-                        if (!(sco = hci_conn_add(hdev, SCO_LINK, dst))) {
-                                hci_conn_put(acl);
-                                return NULL;
-                        }
+        if (!(sco = hci_conn_hash_lookup_ba(hdev, type, dst))) {
+                if (!(sco = hci_conn_add(hdev, type, dst))) {
+                        hci_conn_put(acl);
+                        return NULL;
                 }
-                acl->link = sco;
-                sco->link = acl;
+        }
 
-                hci_conn_hold(sco);
+        acl->link = sco;
+        sco->link = acl;
 
-                if (acl->state == BT_CONNECTED &&
-                                (sco->state == BT_OPEN || sco->state == BT_CLOSED))
-                        hci_add_sco(sco, acl->handle);
+        hci_conn_hold(sco);
 
-                return sco;
-        } else {
-                return acl;
-        }
+        if (acl->state == BT_CONNECTED &&
+                        (sco->state == BT_OPEN || sco->state == BT_CLOSED))
+                hci_add_sco(sco, acl->handle);
+
+        return sco;
 }
 EXPORT_SYMBOL(hci_connect);
 
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 9c71cffbc6b0..f6d867e0179f 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -851,6 +851,7 @@ int hci_register_dev(struct hci_dev *hdev)
 
         hdev->flags = 0;
         hdev->pkt_type  = (HCI_DM1 | HCI_DH1 | HCI_HV1);
+        hdev->esco_type = (ESCO_HV1);
         hdev->link_mode = (HCI_LM_ACCEPT);
 
         hdev->idle_timeout = 0;
@@ -1254,7 +1255,7 @@ EXPORT_SYMBOL(hci_send_sco);
 static inline struct hci_conn *hci_low_sent(struct hci_dev *hdev, __u8 type, int *quote)
 {
         struct hci_conn_hash *h = &hdev->conn_hash;
-        struct hci_conn  *conn = NULL;
+        struct hci_conn *conn = NULL;
         int num = 0, min = ~0;
         struct list_head *p;
 
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 447ba7131220..4baea1e38652 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -350,11 +350,24 @@ static void hci_cc_info_param(struct hci_dev *hdev, __u16 ocf, struct sk_buff *s
                 if (hdev->features[0] & LMP_5SLOT)
                         hdev->pkt_type |= (HCI_DM5 | HCI_DH5);
 
-                if (hdev->features[1] & LMP_HV2)
-                        hdev->pkt_type |= (HCI_HV2);
+                if (hdev->features[1] & LMP_HV2) {
+                        hdev->pkt_type  |= (HCI_HV2);
+                        hdev->esco_type |= (ESCO_HV2);
+                }
+
+                if (hdev->features[1] & LMP_HV3) {
+                        hdev->pkt_type  |= (HCI_HV3);
+                        hdev->esco_type |= (ESCO_HV3);
+                }
 
-                if (hdev->features[1] & LMP_HV3)
-                        hdev->pkt_type |= (HCI_HV3);
+                if (hdev->features[3] & LMP_ESCO)
+                        hdev->esco_type |= (ESCO_EV3);
+
+                if (hdev->features[4] & LMP_EV4)
+                        hdev->esco_type |= (ESCO_EV4);
+
+                if (hdev->features[4] & LMP_EV5)
+                        hdev->esco_type |= (ESCO_EV5);
 
                 BT_DBG("%s: features 0x%x 0x%x 0x%x", hdev->name,
                                 lf->features[0], lf->features[1], lf->features[2]);
@@ -881,12 +894,12 @@ static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *s
                 if (conn) {
                         conn->sent -= count;
 
-                        if (conn->type == SCO_LINK) {
-                                if ((hdev->sco_cnt += count) > hdev->sco_pkts)
-                                        hdev->sco_cnt = hdev->sco_pkts;
-                        } else {
+                        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;
                         }
                 }
         }