Revert "Bluetooth: Allow SCO/eSCO packet type selection for outgoing SCO connections."

This reverts commit 3b077241e02041b1f03fee912896b8de1d7ac096.

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index b32dcff93911fac45ce091612a6225146e07de1a..4f7795f27e04b95a0d83959ab2b0143940cabf9b 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -139,10 +139,8 @@ enum {
 #define ESCO_2EV5      0x0100
 #define ESCO_3EV5      0x0200
 
-#define SCO_ESCO_MASK  (ESCO_HV1 | ESCO_HV2 | ESCO_HV3)
-#define EDR_ESCO_MASK  (ESCO_2EV3 | ESCO_3EV3 | ESCO_2EV5 | ESCO_3EV5)
-#define ALL_ESCO_MASK  (SCO_ESCO_MASK | ESCO_EV3 | ESCO_EV4 | ESCO_EV5 | \
-                       EDR_ESCO_MASK)
+#define SCO_ESCO_MASK  (ESCO_HV1 | ESCO_HV2 | ESCO_HV3)
+#define EDR_ESCO_MASK  (ESCO_2EV3 | ESCO_3EV3 | ESCO_2EV5 | ESCO_3EV5)
 
 /* ACL flags */
 #define ACL_START              0x00

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index cbcc5b102cdbbbb7ac109cb3759c90df5376e2cc..b6d36cbb27731236fd2f16c04cf48ca5a0f91352 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -326,15 +326,12 @@ void hci_acl_disconn(struct hci_conn *conn, __u8 reason);
 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);

diff --git a/include/net/bluetooth/sco.h b/include/net/bluetooth/sco.h
index 924338ac322387084bf8ca2927a8ea1e5e811013..e28a2a7714713a4cbb05dbfd3cd0c514ede79d66 100644 (file)
--- a/include/net/bluetooth/sco.h
+++ b/include/net/bluetooth/sco.h
@@ -37,7 +37,6 @@
 struct sockaddr_sco {
        sa_family_t     sco_family;
        bdaddr_t        sco_bdaddr;
-       __u16           sco_pkt_type;
 };
 
 /* SCO socket options */
@@ -73,8 +72,7 @@ struct sco_conn {
 
 struct sco_pinfo {
        struct bt_sock  bt;
-       __u16           pkt_type;
-
+       __u32           flags;
        struct sco_conn *conn;
 };
 

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 2f4d30fd12276873595eb30e2f93a91910eddf66..fa8b412205cd89546b4a325c558c68040eeaf491 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -196,8 +196,7 @@ static void hci_conn_idle(unsigned long arg)
        hci_conn_enter_sniff_mode(conn);
 }
 
-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)
 {
        struct hci_conn *conn;
 
@@ -222,22 +221,14 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type,
                conn->pkt_type = hdev->pkt_type & ACL_PTYPE_MASK;
                break;
        case SCO_LINK:
-               if (!pkt_type)
-                       pkt_type = SCO_ESCO_MASK;
+               if (lmp_esco_capable(hdev))
+                       conn->pkt_type = (hdev->esco_type & SCO_ESCO_MASK) |
+                                       (hdev->esco_type & EDR_ESCO_MASK);
+               else
+                       conn->pkt_type = hdev->pkt_type & SCO_PTYPE_MASK;
+               break;
        case ESCO_LINK:
-               if (!pkt_type)
-                       pkt_type = ALL_ESCO_MASK;
-               if (lmp_esco_capable(hdev)) {
-                       /* HCI Setup Synchronous Connection Command uses
-                          reverse logic on the EDR_ESCO_MASK bits */
-                       conn->pkt_type = (pkt_type ^ EDR_ESCO_MASK) &
-                                       hdev->esco_type;
-               } else {
-                       /* Legacy HCI Add Sco Connection Command uses a
-                          shifted bitmask */
-                       conn->pkt_type = (pkt_type << 5) & hdev->pkt_type &
-                                       SCO_PTYPE_MASK;
-               }
+               conn->pkt_type = hdev->esco_type & ~EDR_ESCO_MASK;
                break;
        }
 
@@ -349,9 +340,7 @@ 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,
-                                       __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)
 {
        struct hci_conn *acl;
        struct hci_conn *sco;
@@ -359,7 +348,7 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type,
        BT_DBG("%s dst %s", hdev->name, batostr(dst));
 
        if (!(acl = hci_conn_hash_lookup_ba(hdev, ACL_LINK, dst))) {
-               if (!(acl = hci_conn_add(hdev, ACL_LINK, 0, dst)))
+               if (!(acl = hci_conn_add(hdev, ACL_LINK, dst)))
                        return NULL;
        }
 
@@ -375,7 +364,7 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type,
                return acl;
 
        if (!(sco = hci_conn_hash_lookup_ba(hdev, type, dst))) {
-               if (!(sco = hci_conn_add(hdev, type, pkt_type, dst))) {
+               if (!(sco = hci_conn_add(hdev, type, dst))) {
                        hci_conn_put(acl);
                        return NULL;
                }

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 5343e0f664dc760c8acefab557b91c2dc015d43d..10edd1a71f08d9df296d67824d21960dc50f701d 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -579,7 +579,7 @@ static inline void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)
                }
        } else {
                if (!conn) {
-                       conn = hci_conn_add(hdev, ACL_LINK, 0, &cp->bdaddr);
+                       conn = hci_conn_add(hdev, ACL_LINK, &cp->bdaddr);
                        if (conn) {
                                conn->out = 1;
                                conn->link_mode |= HCI_LM_MASTER;
@@ -964,9 +964,7 @@ static inline void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *sk
 
                conn = hci_conn_hash_lookup_ba(hdev, ev->link_type, &ev->bdaddr);
                if (!conn) {
-                       /* pkt_type not yet used for incoming connections */
-                       if (!(conn = hci_conn_add(hdev, ev->link_type, 0,
-                                                       &ev->bdaddr))) {
+                       if (!(conn = hci_conn_add(hdev, ev->link_type, &ev->bdaddr))) {
                                BT_ERR("No memmory for new connection");
                                hci_dev_unlock(hdev);
                                return;

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index b342f0680a7b812ac75db5aa22cfd3d44b738dd5..d056886c002204e1f64128a8f524a15ac9d75bd6 100644 (file)
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -955,7 +955,7 @@ static int l2cap_do_connect(struct sock *sk)
                }
        }
 
-       hcon = hci_connect(hdev, ACL_LINK, 0, dst,
+       hcon = hci_connect(hdev, ACL_LINK, dst,
                                        l2cap_pi(sk)->sec_level, auth_type);
        if (!hcon)
                goto done;

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index e4343cabedf31f32d389c6fdd656b34da08a54d7..77f4153bdb5e5ebe434487497d1e8d3ed0253cbf 100644 (file)
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -176,7 +176,6 @@ static int sco_connect(struct sock *sk)
 {
        bdaddr_t *src = &bt_sk(sk)->src;
        bdaddr_t *dst = &bt_sk(sk)->dst;
-       __u16 pkt_type = sco_pi(sk)->pkt_type;
        struct sco_conn *conn;
        struct hci_conn *hcon;
        struct hci_dev  *hdev;
@@ -193,13 +192,10 @@ static int sco_connect(struct sock *sk)
 
        if (lmp_esco_capable(hdev) && !disable_esco)
                type = ESCO_LINK;
-       else {
+       else
                type = SCO_LINK;
-               pkt_type &= SCO_ESCO_MASK;
-       }
 
-       hcon = hci_connect(hdev, type, pkt_type, dst,
-                                       BT_SECURITY_LOW, HCI_AT_NO_BONDING);
+       hcon = hci_connect(hdev, type, dst, BT_SECURITY_LOW, HCI_AT_NO_BONDING);
        if (!hcon)
                goto done;
 
@@ -455,22 +451,18 @@ static int sco_sock_create(struct net *net, struct socket *sock, int protocol)
        return 0;
 }
 
-static int sco_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
+static int sco_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_len)
 {
-       struct sockaddr_sco sa;
+       struct sockaddr_sco *sa = (struct sockaddr_sco *) addr;
        struct sock *sk = sock->sk;
-       bdaddr_t *src = &sa.sco_bdaddr;
-       int len, err = 0;
+       bdaddr_t *src = &sa->sco_bdaddr;
+       int err = 0;
 
-       BT_DBG("sk %p %s", sk, batostr(&sa.sco_bdaddr));
+       BT_DBG("sk %p %s", sk, batostr(&sa->sco_bdaddr));
 
        if (!addr || addr->sa_family != AF_BLUETOOTH)
                return -EINVAL;
 
-       memset(&sa, 0, sizeof(sa));
-       len = min_t(unsigned int, sizeof(sa), alen);
-       memcpy(&sa, addr, len);
-
        lock_sock(sk);
 
        if (sk->sk_state != BT_OPEN) {
@@ -484,8 +476,7 @@ static int sco_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
                err = -EADDRINUSE;
        } else {
                /* Save source address */
-               bacpy(&bt_sk(sk)->src, &sa.sco_bdaddr);
-               sco_pi(sk)->pkt_type = sa.sco_pkt_type;
+               bacpy(&bt_sk(sk)->src, &sa->sco_bdaddr);
                sk->sk_state = BT_BOUND;
        }
 
@@ -498,34 +489,26 @@ done:
 
 static int sco_sock_connect(struct socket *sock, struct sockaddr *addr, int alen, int flags)
 {
+       struct sockaddr_sco *sa = (struct sockaddr_sco *) addr;
        struct sock *sk = sock->sk;
-       struct sockaddr_sco sa;
-       int len, err = 0;
+       int err = 0;
+
 
        BT_DBG("sk %p", sk);
 
-       if (!addr || addr->sa_family != AF_BLUETOOTH)
+       if (addr->sa_family != AF_BLUETOOTH || alen < sizeof(struct sockaddr_sco))
                return -EINVAL;
 
-       memset(&sa, 0, sizeof(sa));
-       len = min_t(unsigned int, sizeof(sa), alen);
-       memcpy(&sa, addr, len);
-
-       lock_sock(sk);
+       if (sk->sk_state != BT_OPEN && sk->sk_state != BT_BOUND)
+               return -EBADFD;
 
-       if (sk->sk_type != SOCK_SEQPACKET) {
-               err = -EINVAL;
-               goto done;
-       }
+       if (sk->sk_type != SOCK_SEQPACKET)
+               return -EINVAL;
 
-       if (sk->sk_state != BT_OPEN && sk->sk_state != BT_BOUND) {
-               err = -EBADFD;
-               goto done;
-       }
+       lock_sock(sk);
 
        /* Set destination address and psm */
-       bacpy(&bt_sk(sk)->dst, &sa.sco_bdaddr);
-       sco_pi(sk)->pkt_type = sa.sco_pkt_type;
+       bacpy(&bt_sk(sk)->dst, &sa->sco_bdaddr);
 
        if ((err = sco_connect(sk)))
                goto done;
@@ -631,7 +614,6 @@ static int sco_sock_getname(struct socket *sock, struct sockaddr *addr, int *len
                bacpy(&sa->sco_bdaddr, &bt_sk(sk)->dst);
        else
                bacpy(&sa->sco_bdaddr, &bt_sk(sk)->src);
-       sa->sco_pkt_type = sco_pi(sk)->pkt_type;
 
        return 0;
 }