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

Commit 27695fb4 authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Gustavo Padovan
Browse files

Bluetooth: AMP: Process Logical Link complete evt 



After receiving HCI Logical Link Complete event finish EFS
configuration by sending L2CAP Conf Response with success code.

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 d5e91192

include/net/bluetooth/l2cap.h

+2 −0
Original line number Diff line number Diff line
@@ -810,5 +810,7 @@ void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan); 
void l2cap_chan_del(struct l2cap_chan *chan, int err);

void l2cap_send_conn_req(struct l2cap_chan *chan);

void l2cap_move_start(struct l2cap_chan *chan);

void l2cap_logical_cfm(struct l2cap_chan *chan, struct hci_chan *hchan,

		       u8 status);



#endif /* __L2CAP_H */

net/bluetooth/hci_event.c

+42 −0
Original line number Diff line number Diff line
@@ -3695,6 +3695,44 @@ static void hci_phy_link_complete_evt(struct hci_dev *hdev, 
	}

}



static void hci_loglink_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)

{

	struct hci_ev_logical_link_complete *ev = (void *) skb->data;

	struct hci_conn *hcon;

	struct hci_chan *hchan;

	struct amp_mgr *mgr;



	BT_DBG("%s log_handle 0x%4.4x phy_handle 0x%2.2x status 0x%2.2x",

	       hdev->name, le16_to_cpu(ev->handle), ev->phy_handle,

	       ev->status);



	hcon = hci_conn_hash_lookup_handle(hdev, ev->phy_handle);

	if (!hcon)

		return;



	/* Create AMP hchan */

	hchan = hci_chan_create(hcon);

	if (!hchan)

		return;



	hchan->handle = le16_to_cpu(ev->handle);



	BT_DBG("hcon %p mgr %p hchan %p", hcon, hcon->amp_mgr, hchan);



	mgr = hcon->amp_mgr;

	if (mgr && mgr->bredr_chan) {

		struct l2cap_chan *bredr_chan = mgr->bredr_chan;



		l2cap_chan_lock(bredr_chan);



		bredr_chan->conn->mtu = hdev->block_mtu;

		l2cap_logical_cfm(bredr_chan, hchan, 0);

		hci_conn_hold(hcon);



		l2cap_chan_unlock(bredr_chan);

	}

}



static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)

{

	struct hci_ev_le_conn_complete *ev = (void *) skb->data;
@@ -4026,6 +4064,10 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb) 
		hci_phy_link_complete_evt(hdev, skb);

		break;



	case HCI_EV_LOGICAL_LINK_COMPLETE:

		hci_loglink_complete_evt(hdev, skb);

		break;



	case HCI_EV_NUM_COMP_BLOCKS:

		hci_num_comp_blocks_evt(hdev, skb);

		break;

net/bluetooth/l2cap_core.c

+2 −2
Original line number Diff line number Diff line
@@ -4428,7 +4428,7 @@ static void l2cap_logical_finish_move(struct l2cap_chan *chan, 
}



/* Call with chan locked */

static void l2cap_logical_cfm(struct l2cap_chan *chan, struct hci_chan *hchan,

void l2cap_logical_cfm(struct l2cap_chan *chan, struct hci_chan *hchan,

		       u8 status)

{

	BT_DBG("chan %p, hchan %p, status %d", chan, hchan, status);