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

Commit 419e08c1 authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Gustavo Padovan
Browse files

Bluetooth: Disconnect logical link when deleting chan 



Disconnect logical link for high speed channel hs_hchan
associated with L2CAP channel chan.

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent e58917b9

include/net/bluetooth/amp.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ void amp_accept_phylink(struct hci_dev *hdev, struct amp_mgr *mgr, 
void amp_write_remote_assoc(struct hci_dev *hdev, u8 handle);

void amp_write_rem_assoc_continue(struct hci_dev *hdev, u8 handle);

void amp_create_logical_link(struct l2cap_chan *chan);

void amp_disconnect_logical_link(struct hci_chan *hchan);

void amp_destroy_logical_link(struct hci_chan *hchan, u8 reason);



#endif /* __AMP_H */

net/bluetooth/amp.c

+14 −0
Original line number Diff line number Diff line
@@ -422,6 +422,20 @@ void amp_create_logical_link(struct l2cap_chan *chan) 
	hci_dev_put(hdev);

}



void amp_disconnect_logical_link(struct hci_chan *hchan)

{

	struct hci_conn *hcon = hchan->conn;

	struct hci_cp_disconn_logical_link cp;



	if (hcon->state != BT_CONNECTED) {

		BT_DBG("hchan %p not connected", hchan);

		return;

	}



	cp.log_handle = cpu_to_le16(hchan->handle);

	hci_send_cmd(hcon->hdev, HCI_OP_DISCONN_LOGICAL_LINK, sizeof(cp), &cp);

}



void amp_destroy_logical_link(struct hci_chan *hchan, u8 reason)

{

	BT_DBG("hchan %p", hchan);

net/bluetooth/l2cap_core.c

+7 −0
Original line number Diff line number Diff line
@@ -578,6 +578,13 @@ void l2cap_chan_del(struct l2cap_chan *chan, int err) 
			mgr->bredr_chan = NULL;

	}



	if (chan->hs_hchan) {

		struct hci_chan *hs_hchan = chan->hs_hchan;



		BT_DBG("chan %p disconnect hs_hchan %p", chan, hs_hchan);

		amp_disconnect_logical_link(hs_hchan);

	}



	chan->ops->teardown(chan, err);



	if (test_bit(CONF_NOT_COMPLETE, &chan->conf_state))