From 7756757c1883c5c806b3f483861abcfd52b0b134 Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Thu, 20 Oct 2011 17:02:44 +0300 Subject: [PATCH] --- yaml --- r: 277707 b: refs/heads/master c: c6337ea6e5771a3c51c1ac7295a16f390220abe1 h: refs/heads/master i: 277705: 7ae17af7105cbd6e911e764e58ea91c500905743 277703: aee624aa750e3c78065bad3695daf277773c39d7 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/l2cap_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bc5ea509f382..9ff7708d8444 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e6b3b95f26e1253cd429cf949b9c41598ba3033 +refs/heads/master: c6337ea6e5771a3c51c1ac7295a16f390220abe1 diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c index 7d663bd3bc5d..18b0bba8630f 100644 --- a/trunk/net/bluetooth/l2cap_core.c +++ b/trunk/net/bluetooth/l2cap_core.c @@ -3021,7 +3021,7 @@ static inline int l2cap_information_req(struct l2cap_conn *conn, struct l2cap_cm struct l2cap_info_rsp *rsp = (struct l2cap_info_rsp *) buf; rsp->type = cpu_to_le16(L2CAP_IT_FIXED_CHAN); rsp->result = cpu_to_le16(L2CAP_IR_SUCCESS); - memcpy(buf + 4, l2cap_fixed_chan, 8); + memcpy(rsp->data, l2cap_fixed_chan, sizeof(l2cap_fixed_chan)); l2cap_send_cmd(conn, cmd->ident, L2CAP_INFO_RSP, sizeof(buf), buf); } else {