diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-01-31 11:11:06 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-01-31 11:19:42 +0100 |
| commit | 058c5b3f571df0df7292a45b3b2d441e93cb5413 (patch) | |
| tree | 541789827e09f23662236db2b5435a58b8f0d4e4 | |
| parent | 917c9ef1c15b6ff84b8fb464d2f377caec69c17b (diff) | |
BT: Fix after merge of android branch
Needs to be tested
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 3 | ||||
| -rw-r--r-- | net/bluetooth/hci_conn.c | 3 | ||||
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 4 | ||||
| -rw-r--r-- | net/bluetooth/mgmt.c | 4 | ||||
| -rw-r--r-- | net/bluetooth/sco.c | 3 |
5 files changed, 10 insertions, 7 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index e752a68762a..efb5a8e96d9 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -472,7 +472,8 @@ 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); + __u8 sec_level, __u8 auth_type, + struct bt_sco_parameters *sco_parameters); int hci_conn_check_link_mode(struct hci_conn *conn); int hci_conn_check_secure(struct hci_conn *conn, __u8 sec_level); int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type); diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index cbad08ff3ae..9ee8b5bb1ff 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -522,7 +522,8 @@ EXPORT_SYMBOL(hci_get_route); * 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) + __u8 sec_level, __u8 auth_type, + struct bt_sco_parameters *sco_parameters) { struct hci_conn *acl; struct hci_conn *sco; diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index b73b476a69b..9ee52263770 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -1114,10 +1114,10 @@ int l2cap_chan_connect(struct l2cap_chan *chan) if (chan->dcid == L2CAP_CID_LE_DATA) hcon = hci_connect(hdev, LE_LINK, 0, dst, - chan->sec_level, auth_type); + chan->sec_level, auth_type, NULL); else hcon = hci_connect(hdev, ACL_LINK, 0, dst, - chan->sec_level, auth_type); + chan->sec_level, auth_type, NULL); if (IS_ERR(hcon)) { err = PTR_ERR(hcon); diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 77dd40664b7..7758f02019d 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -1354,10 +1354,10 @@ static int pair_device(struct sock *sk, u16 index, unsigned char *data, u16 len) entry = hci_find_adv_entry(hdev, &cp->bdaddr); if (entry) conn = hci_connect(hdev, LE_LINK, 0, &cp->bdaddr, sec_level, - auth_type); + auth_type, NULL); else conn = hci_connect(hdev, ACL_LINK, 0, &cp->bdaddr, sec_level, - auth_type); + auth_type, NULL); if (IS_ERR(conn)) { err = PTR_ERR(conn); diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 35b3a2b6de0..716952149f6 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -179,6 +179,7 @@ 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 bt_sco_parameters *param = &sco_pi(sk)->param; struct sco_conn *conn; struct hci_conn *hcon; struct hci_dev *hdev; @@ -199,7 +200,7 @@ static int sco_connect(struct sock *sk) 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, pkt_type, dst, BT_SECURITY_LOW, HCI_AT_NO_BONDING, param); if (IS_ERR(hcon)) { err = PTR_ERR(hcon); goto done; |