diff options
| author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2012-11-01 15:37:03 +0200 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-11-01 20:27:11 -0200 |
| commit | fffadc08ebf1f4c61bb8f9be0f1d8c3c053d815f (patch) | |
| tree | 4669ea95e47533e8b39b0546daf0df7c325cae3e /net/bluetooth/amp.c | |
| parent | 6e1df6a60372b6ea00c480c1cd8c8c8134357d89 (diff) | |
| download | linux-fffadc08ebf1f4c61bb8f9be0f1d8c3c053d815f.tar.bz2 | |
Bluetooth: Rename ctrl_id to remote_amp_id
Since we have started to use local_amp_id for local AMP
Controller Id it makes sense to rename ctrl_id to remote_amp_id
since it represents remote AMP controller Id.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/amp.c')
| -rw-r--r-- | net/bluetooth/amp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/bluetooth/amp.c b/net/bluetooth/amp.c index 650bb8df04fd..4b2fea6c1c2a 100644 --- a/net/bluetooth/amp.c +++ b/net/bluetooth/amp.c @@ -387,7 +387,7 @@ void amp_physical_cfm(struct hci_conn *bredr_hcon, struct hci_conn *hs_hcon) bredr_chan = mgr->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->hs_hcon = hs_hcon; bredr_chan->conn->mtu = hs_hcon->hdev->block_mtu; bredr_chan->fcs = L2CAP_FCS_NONE; @@ -412,8 +412,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) |