Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdc8ead2 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

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: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 547d1032

net/bluetooth/a2mp.c

+2 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;