From 6bbfe97023c0d7ef00ba2ddae5987e77cbcdf410 Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Thu, 19 Jul 2012 17:03:46 +0300 Subject: [PATCH] --- yaml --- r: 327463 b: refs/heads/master c: d9fc1d54f6f8123909cdee4fa98ab1ebf6c8651c h: refs/heads/master i: 327461: 353367c65081085f65eaaf755a13088fcfac530f 327459: 1cc0a7fb85a5524f0b3b30a821cfdc419f5fcfdf 327455: dd6f2dab931a9acf3cd7b8f047efe3191e48ad85 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/a2mp.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7f279fa6db25..c1988f5e4865 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab846ec4eaea1156148841b194df808ad745bbe2 +refs/heads/master: d9fc1d54f6f8123909cdee4fa98ab1ebf6c8651c diff --git a/trunk/net/bluetooth/a2mp.c b/trunk/net/bluetooth/a2mp.c index 57094c136230..79af661a58dd 100644 --- a/trunk/net/bluetooth/a2mp.c +++ b/trunk/net/bluetooth/a2mp.c @@ -325,15 +325,17 @@ static inline int a2mp_cmd_rsp(struct amp_mgr *mgr, struct sk_buff *skb, /* Handle A2MP signalling */ static int a2mp_chan_recv_cb(struct l2cap_chan *chan, struct sk_buff *skb) { - struct a2mp_cmd *hdr = (void *) skb->data; + struct a2mp_cmd *hdr; struct amp_mgr *mgr = chan->data; int err = 0; amp_mgr_get(mgr); while (skb->len >= sizeof(*hdr)) { - struct a2mp_cmd *hdr = (void *) skb->data; - u16 len = le16_to_cpu(hdr->len); + u16 len; + + hdr = (void *) skb->data; + len = le16_to_cpu(hdr->len); BT_DBG("code 0x%2.2x id %d len %u", hdr->code, hdr->ident, len); @@ -393,7 +395,9 @@ static int a2mp_chan_recv_cb(struct l2cap_chan *chan, struct sk_buff *skb) if (err) { struct a2mp_cmd_rej rej; + rej.reason = __constant_cpu_to_le16(0); + hdr = (void *) skb->data; BT_DBG("Send A2MP Rej: cmd 0x%2.2x err %d", hdr->code, err);