Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 315676
b: refs/heads/master
c: 89d8b40
h: refs/heads/master
v: v3
  • Loading branch information
Andrei Emeltchenko authored and Gustavo Padovan committed Jul 10, 2012
1 parent 8c76fb9 commit 286df84
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ad0ac6ca5ffc959b7f8af2c76da4bf2f120aa0ee
refs/heads/master: 89d8b4078921023c52551b641b647352751ae714
5 changes: 3 additions & 2 deletions trunk/net/bluetooth/l2cap_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -5379,7 +5379,7 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
if (!conn)
return 0;

BT_DBG("conn %p", conn);
BT_DBG("conn %p status 0x%2.2x encrypt %u", conn, status, encrypt);

if (hcon->type == LE_LINK) {
if (!status && encrypt)
Expand All @@ -5392,7 +5392,8 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
list_for_each_entry(chan, &conn->chan_l, list) {
l2cap_chan_lock(chan);

BT_DBG("chan->scid %d", chan->scid);
BT_DBG("chan %p scid 0x%4.4x state %s", chan, chan->scid,
state_to_string(chan->state));

if (chan->scid == L2CAP_CID_LE_DATA) {
if (!status && encrypt) {
Expand Down

0 comments on commit 286df84

Please sign in to comment.