From 1607db702688907ea916de749fdbd3b433cec5b7 Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Mon, 12 Mar 2012 12:13:07 +0200 Subject: [PATCH] --- yaml --- r: 306839 b: refs/heads/master c: 61386cba0fae4744b8e2f52c4911fe3af9ff6c54 h: refs/heads/master i: 306837: c7da3ca02056de1e5422a1a1589502d4ee6680ca 306835: b939ae258b6c9ac604a8b195f0421051704f198f 306831: 8e18ccb4cabee08c2db1c41ed1dc323e2732deaa v: v3 --- [refs] | 2 +- trunk/net/bluetooth/l2cap_core.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8565b0f427d8..42b80abb8ceb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58115373e74c7ee18d0f54f00831649a6471a899 +refs/heads/master: 61386cba0fae4744b8e2f52c4911fe3af9ff6c54 diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c index 7b8a88fd3b78..0914cca7b578 100644 --- a/trunk/net/bluetooth/l2cap_core.c +++ b/trunk/net/bluetooth/l2cap_core.c @@ -2957,14 +2957,14 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr struct l2cap_conf_rsp *rsp = (struct l2cap_conf_rsp *)data; u16 scid, flags, result; struct l2cap_chan *chan; - int len = cmd->len - sizeof(*rsp); + int len = le16_to_cpu(cmd->len) - sizeof(*rsp); scid = __le16_to_cpu(rsp->scid); flags = __le16_to_cpu(rsp->flags); result = __le16_to_cpu(rsp->result); - BT_DBG("scid 0x%4.4x flags 0x%2.2x result 0x%2.2x", - scid, flags, result); + BT_DBG("scid 0x%4.4x flags 0x%2.2x result 0x%2.2x len %d", scid, flags, + result, len); chan = l2cap_get_chan_by_scid(conn, scid); if (!chan)