Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 247626
b: refs/heads/master
c: 55183d0
h: refs/heads/master
v: v3
  • Loading branch information
Gustavo F. Padovan committed May 12, 2011
1 parent fc19d15 commit 337ecc4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 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: 365227e5fdf3d117e096416d9d3cc148959a829e
refs/heads/master: 55183d06cd1bd939ceccdad628b0aae12c86b803
4 changes: 1 addition & 3 deletions trunk/net/bluetooth/l2cap_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2095,7 +2095,7 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd
u16 dcid = 0, scid = __le16_to_cpu(req->scid);
__le16 psm = req->psm;

BT_ERR("psm 0x%2.2x scid 0x%4.4x", psm, scid);
BT_DBG("psm 0x%2.2x scid 0x%4.4x", psm, scid);

/* Check if we have socket listening on psm */
pchan = l2cap_global_chan_by_psm(BT_LISTEN, psm, conn->src);
Expand All @@ -2104,8 +2104,6 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd
goto sendresp;
}

BT_ERR("%p 0x%2.2x", pchan, pchan->psm);

parent = pchan->sk;

bh_lock_sock(parent);
Expand Down

0 comments on commit 337ecc4

Please sign in to comment.