Merge tag 'for-v3.8' of git://git.infradead.org/users/cbou/linux-pstore

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

diff --git a/net/bluetooth/amp.c b/net/bluetooth/amp.c
index 917e034b9aa5332972b988af99f0e73aa0daebb4..1b0d92c0643a97595ea2ad44e69f2cf45b96a852 100644 (file)
--- a/net/bluetooth/amp.c
+++ b/net/bluetooth/amp.c
@@ -373,6 +373,34 @@ void amp_accept_phylink(struct hci_dev *hdev, struct amp_mgr *mgr,
        hci_send_cmd(hdev, HCI_OP_ACCEPT_PHY_LINK, sizeof(cp), &cp);
 }
 
+void amp_physical_cfm(struct hci_conn *bredr_hcon, struct hci_conn *hs_hcon)
+{
+       struct hci_dev *bredr_hdev = hci_dev_hold(bredr_hcon->hdev);
+       struct amp_mgr *mgr = hs_hcon->amp_mgr;
+       struct l2cap_chan *bredr_chan;
+
+       BT_DBG("bredr_hcon %p hs_hcon %p mgr %p", bredr_hcon, hs_hcon, mgr);
+
+       if (!bredr_hdev || !mgr || !mgr->bredr_chan)
+               return;
+
+       bredr_chan = mgr->bredr_chan;
+
+       l2cap_chan_lock(bredr_chan);
+
+       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;
+
+       __l2cap_physical_cfm(bredr_chan, 0);
+
+       l2cap_chan_unlock(bredr_chan);
+
+       hci_dev_put(bredr_hdev);
+}
+
 void amp_create_logical_link(struct l2cap_chan *chan)
 {
        struct hci_cp_create_accept_logical_link cp;
@@ -388,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)