Bluetooth: Remove l2cap_conn->dst usage from AMP manager
Subsystems (2)
Marcel Holtmann
maintainerPATCH 1/4 Bluetooth: Remove l2cap_conn->dst usage from AMP manager
The l2cap_conn->dst address is just a pointer into the hci_conn->dst structure. Use hci_conn->dst directly instead.
Signed-off-by Marcel Holtmann <[email protected]>
--- net/bluetooth/a2mp.c | 3 ++- net/bluetooth/amp.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-)
net/bluetooth/a2mp.c +2 -1
@@ -537,7 +537,8 @@ static int a2mp_discphyslink_req(struct amp_mgr *mgr, struct sk_buff *skb, goto send_rsp; } - hcon =hci_conn_hash_lookup_ba (hdev,AMP_LINK , mgr->l2cap_conn->dst); + hcon =hci_conn_hash_lookup_ba (hdev,AMP_LINK , + &mgr->l2cap_conn->hcon->dst);if (!hcon) {BT_ERR ("No phys link exist" ); rsp.status =A2MP_STATUS_NO_PHYSICAL_LINK_EXISTS ;
net/bluetooth/amp.c +3 -2
@@ -111,7 +111,7 @@ static u8 __next_handle(struct amp_mgr *mgr)struct hci_conn *phylink_add (struct hci_dev *hdev,struct amp_mgr *mgr,u8 remote_id,bool out) { -bdaddr_t *dst = mgr->l2cap_conn->dst; +bdaddr_t *dst = &mgr->l2cap_conn->hcon->dst;struct hci_conn *hcon; hcon =hci_conn_add (hdev,AMP_LINK , dst);
@@ -410,7 +410,8 @@ void amp_create_logical_link(struct l2cap_chan *chan)struct hci_cp_create_accept_logical_link cp;struct hci_dev *hdev; -BT_DBG ("chan %p hs_hcon %p dst %pMR" , chan, hs_hcon, chan->conn->dst); +BT_DBG ("chan %p hs_hcon %p dst %pMR" , chan, hs_hcon, + &chan->conn->hcon->dst);if (!hs_hcon)return ;
Signature · 1 line
1.8.3.1
Hi Marcel,
Quoted 8 lines · Marcel Holtmann
The
l2cap_conn->dstaddress is just a pointer into thehci_conn->dststructure. Usehci_conn->dstdirectly instead.Signed-off-by Marcel Holtmann <[email protected]>--- net/bluetooth/a2mp.c | 3 ++- net/bluetooth/amp.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-)
All four patches in this set have been applied to bluetooth-next. Thanks.
Johan