diff options
| author | Peter Hurley <peter@xxxxxxxxxxxxxxxxxx> | 2011-08-09 16:26:55 -0400 |
|---|---|---|
| committer | Jaikumar Ganesh <jaikumarg@android.com> | 2011-08-29 15:24:13 -0700 |
| commit | 5e4fcd2c556e25e1b6787dcd0c97b06e29e42292 (patch) | |
| tree | 9c4a242420f7729abea46f8757c0b3fb0cac5bd5 | |
| parent | 9b076887d4fd85a5bb90a017571cccb95f467bec (diff) | |
Bluetooth: Fix l2cap conn failures for ssp devicescommon-android-3.0
Commit 330605423c fixed l2cap conn establishment for non-ssp remote
devices by not setting HCI_CONN_ENCRYPT_PEND every time conn security
is tested (which was always returning failure on any subsequent
security checks).
However, this broke l2cap conn establishment for ssp remote devices
when an ACL link was already established at SDP-level security. This
fix ensures that encryption must be pending whenever authentication
is also pending.
Change-Id: I6876ea5134e90d1f3d0f84e8ed40b92977b3df64
Signed-off-by: Peter Hurley <peter@xxxxxxxxxxxxxxxxxx>
| -rw-r--r-- | net/bluetooth/hci_conn.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 5ec0db42316..33c4e0cd83b 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -619,6 +619,10 @@ static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type) if (!test_and_set_bit(HCI_CONN_AUTH_PEND, &conn->pend)) { struct hci_cp_auth_requested cp; + + /* encrypt must be pending if auth is also pending */ + set_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend); + cp.handle = cpu_to_le16(conn->handle); hci_send_cmd(conn->hdev, HCI_OP_AUTH_REQUESTED, sizeof(cp), &cp); |