aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>2012-11-01 09:37:03 -0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-11-01 18:27:11 -0400
commitfffadc08ebf1f4c61bb8f9be0f1d8c3c053d815f (patch)
tree4669ea95e47533e8b39b0546daf0df7c325cae3e /net/bluetooth
parent6e1df6a60372b6ea00c480c1cd8c8c8134357d89 (diff)
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')
-rw-r--r--net/bluetooth/a2mp.c4
-rw-r--r--net/bluetooth/amp.c5
-rw-r--r--net/bluetooth/l2cap_core.c2
3 files changed, 5 insertions, 6 deletions
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
index d5136cfb57e2..2f67d5ecc907 100644
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
@@ -423,7 +423,7 @@ static int a2mp_getampassoc_rsp(struct amp_mgr *mgr, struct sk_buff *skb,
423 423
424 BT_DBG("Created hcon %p: loc:%d -> rem:%d", hcon, hdev->id, rsp->id); 424 BT_DBG("Created hcon %p: loc:%d -> rem:%d", hcon, hdev->id, rsp->id);
425 425
426 mgr->bredr_chan->ctrl_id = rsp->id; 426 mgr->bredr_chan->remote_amp_id = rsp->id;
427 427
428 amp_create_phylink(hdev, mgr, hcon); 428 amp_create_phylink(hdev, mgr, hcon);
429 429
@@ -939,7 +939,7 @@ void a2mp_send_create_phy_link_req(struct hci_dev *hdev, u8 status)
939 goto clean; 939 goto clean;
940 940
941 req->local_id = hdev->id; 941 req->local_id = hdev->id;
942 req->remote_id = bredr_chan->ctrl_id; 942 req->remote_id = bredr_chan->remote_amp_id;
943 memcpy(req->amp_assoc, loc_assoc->data, loc_assoc->len); 943 memcpy(req->amp_assoc, loc_assoc->data, loc_assoc->len);
944 944
945 a2mp_send(mgr, A2MP_CREATEPHYSLINK_REQ, __next_ident(mgr), len, req); 945 a2mp_send(mgr, A2MP_CREATEPHYSLINK_REQ, __next_ident(mgr), len, req);
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)
387 bredr_chan = mgr->bredr_chan; 387 bredr_chan = mgr->bredr_chan;
388 388
389 set_bit(FLAG_EFS_ENABLE, &bredr_chan->flags); 389 set_bit(FLAG_EFS_ENABLE, &bredr_chan->flags);
390 bredr_chan->ctrl_id = hs_hcon->remote_id; 390 bredr_chan->remote_amp_id = hs_hcon->remote_id;
391 bredr_chan->hs_hcon = hs_hcon; 391 bredr_chan->hs_hcon = hs_hcon;
392 bredr_chan->conn->mtu = hs_hcon->hdev->block_mtu; 392 bredr_chan->conn->mtu = hs_hcon->hdev->block_mtu;
393 bredr_chan->fcs = L2CAP_FCS_NONE; 393 bredr_chan->fcs = L2CAP_FCS_NONE;
@@ -412,8 +412,7 @@ void amp_create_logical_link(struct l2cap_chan *chan)
412 if (!hdev) 412 if (!hdev)
413 return; 413 return;
414 414
415 BT_DBG("chan %p ctrl_id %d dst %pMR", chan, chan->ctrl_id, 415 BT_DBG("chan %p dst %pMR", chan, chan->conn->dst);
416 chan->conn->dst);
417 416
418 hcon = hci_conn_hash_lookup_ba(hdev, AMP_LINK, chan->conn->dst); 417 hcon = hci_conn_hash_lookup_ba(hdev, AMP_LINK, chan->conn->dst);
419 if (!hcon) 418 if (!hcon)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 2f0e165eef4d..a1faaab41839 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -4615,7 +4615,7 @@ static void l2cap_do_move_cancel(struct l2cap_chan *chan, int result)
4615void l2cap_physical_cfm(struct l2cap_chan *chan, int result) 4615void l2cap_physical_cfm(struct l2cap_chan *chan, int result)
4616{ 4616{
4617 u8 local_amp_id = chan->local_amp_id; 4617 u8 local_amp_id = chan->local_amp_id;
4618 u8 remote_amp_id = chan->ctrl_id; 4618 u8 remote_amp_id = chan->remote_amp_id;
4619 4619
4620 BT_DBG("chan %p, result %d, local_amp_id %d, remote_amp_id %d", 4620 BT_DBG("chan %p, result %d, local_amp_id %d, remote_amp_id %d",
4621 chan, result, local_amp_id, remote_amp_id); 4621 chan, result, local_amp_id, remote_amp_id);