DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bluetooth: LE sockets not ready until encrypted" into msm-3.0

Browse Source
This commit is contained in:
Linux Build Service Account
2012-02-12 15:40:29 -08:00
committed by QuIC Gerrit Code Review
parent c2fee311ba 416db90511
commit 3dddea6b7e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net/bluetooth/l2cap_core.c
View File

@@ -7440,11 +7440,12 @@ static int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
BT_DBG("sk->scid %d", l2cap_pi(sk)->scid); BT_DBG("sk->scid %d", l2cap_pi(sk)->scid);
if (l2cap_pi(sk)->scid == L2CAP_CID_LE_DATA) { if (l2cap_pi(sk)->scid == L2CAP_CID_LE_DATA) {
if (!status && encrypt) if (!status && encrypt) {
l2cap_pi(sk)->sec_level = hcon->sec_level; l2cap_pi(sk)->sec_level = hcon->sec_level;
l2cap_chan_ready(sk);
}
del_timer(&hcon->smp_timer); del_timer(&hcon->smp_timer);
l2cap_chan_ready(sk);
smp_link_encrypt_cmplt(conn, status, encrypt); smp_link_encrypt_cmplt(conn, status, encrypt);
bh_unlock_sock(sk); bh_unlock_sock(sk);