Merge tag 'stable/for-linus-3.8-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/net/bluetooth/amp.c b/net/bluetooth/amp.c
index eaf473ffeef9e47fe3e67de9b9245e257ce8aeea..1b0d92c0643a97595ea2ad44e69f2cf45b96a852 100644 (file)
--- a/net/bluetooth/amp.c
+++ b/net/bluetooth/amp.c
@@ -390,9 +390,9 @@ void amp_physical_cfm(struct hci_conn *bredr_hcon, struct hci_conn *hs_hcon)
 
        set_bit(FLAG_EFS_ENABLE, &bredr_chan->flags);
        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);