Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[~andy/linux] / net / bluetooth / amp.c

diff --git a/net/bluetooth/amp.c b/net/bluetooth/amp.c
index 650bb8df04fd3361eec6ab59b553beefbfafdfac..1b0d92c0643a97595ea2ad44e69f2cf45b96a852 100644 (file)
--- a/net/bluetooth/amp.c
+++ b/net/bluetooth/amp.c
@@ -386,13 +386,17 @@ void amp_physical_cfm(struct hci_conn *bredr_hcon, struct hci_conn *hs_hcon)
 
        bredr_chan = mgr->bredr_chan;
 
+       l2cap_chan_lock(bredr_chan);
+
        set_bit(FLAG_EFS_ENABLE, &bredr_chan->flags);
-       bredr_chan->ctrl_id = hs_hcon->remote_id;
+       bredr_chan->remote_amp_id = hs_hcon->remote_id;
+       bredr_chan->local_amp_id = hs_hcon->hdev->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);
+       __l2cap_physical_cfm(bredr_chan, 0);
+
+       l2cap_chan_unlock(bredr_chan);
 
        hci_dev_put(bredr_hdev);
 }
@@ -412,8 +416,7 @@ void amp_create_logical_link(struct l2cap_chan *chan)
        if (!hdev)
                return;
 
-       BT_DBG("chan %p ctrl_id %d dst %pMR", chan, chan->ctrl_id,
-              chan->conn->dst);
+       BT_DBG("chan %p dst %pMR", chan, chan->conn->dst);
 
        hcon = hci_conn_hash_lookup_ba(hdev, AMP_LINK, chan->conn->dst);
        if (!hcon)