From 45aa4dcaab6ac7ec591005a4f820ed447aeded06 Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Wed, 14 Nov 2012 17:39:31 +0200 Subject: [PATCH] --- yaml --- r: 341543 b: refs/heads/master c: 12d6cc60f2d02d5754ca662b414f8f96200b14a6 h: refs/heads/master i: 341541: 4f99ade257ab324de6cb7fa29495a99684293e64 341539: db8c9ae454b38e3c7c1613be78cb6258acb22c1f 341535: df38bb9cf543ffcf25cd9d95a23dd3328c494fbb v: v3 --- [refs] | 2 +- trunk/net/bluetooth/amp.c | 1 - trunk/net/bluetooth/l2cap_core.c | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 64667df67225..fa08a95abdfc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a514b17fab51c1433db920d76cf8ddda959e5da0 +refs/heads/master: 12d6cc60f2d02d5754ca662b414f8f96200b14a6 diff --git a/trunk/net/bluetooth/amp.c b/trunk/net/bluetooth/amp.c index eaf473ffeef9..0258b2645edb 100644 --- a/trunk/net/bluetooth/amp.c +++ b/trunk/net/bluetooth/amp.c @@ -392,7 +392,6 @@ void amp_physical_cfm(struct hci_conn *bredr_hcon, struct hci_conn *hs_hcon) bredr_chan->remote_amp_id = hs_hcon->remote_id; bredr_chan->hs_hcon = hs_hcon; bredr_chan->conn->mtu = hs_hcon->hdev->block_mtu; - bredr_chan->fcs = L2CAP_FCS_NONE; __l2cap_physical_cfm(bredr_chan, 0); diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c index 22c4ef926b0d..fc92fe341115 100644 --- a/trunk/net/bluetooth/l2cap_core.c +++ b/trunk/net/bluetooth/l2cap_core.c @@ -4517,6 +4517,8 @@ void l2cap_move_start(struct l2cap_chan *chan) static void l2cap_do_create(struct l2cap_chan *chan, int result, u8 local_amp_id, u8 remote_amp_id) { + chan->fcs = L2CAP_FCS_NONE; + if (!test_bit(CONF_CONNECT_PEND, &chan->conf_state)) { struct l2cap_conn_rsp rsp; char buf[128];