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

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

Bluetooth: A2MP: Process Discover Response 



When receiving A2MP Discover Response send A2MP Get Info Request
for each AMP controller in the discovery list.

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 903e4541

net/bluetooth/a2mp.c

+61 −1
Original line number Diff line number Diff line
@@ -67,6 +67,14 @@ void a2mp_send(struct amp_mgr *mgr, u8 code, u8 ident, u16 len, void *data) 
	kfree(cmd);

}



static u8 __next_ident(struct amp_mgr *mgr)

{

	if (++mgr->ident == 0)

		mgr->ident = 1;



	return mgr->ident;

}



static inline void __a2mp_cl_bredr(struct a2mp_cl *cl)

{

	cl->id = 0;
@@ -165,6 +173,55 @@ static int a2mp_discover_req(struct amp_mgr *mgr, struct sk_buff *skb, 
	return 0;

}



static int a2mp_discover_rsp(struct amp_mgr *mgr, struct sk_buff *skb,

			     struct a2mp_cmd *hdr)

{

	struct a2mp_discov_rsp *rsp = (void *) skb->data;

	u16 len = le16_to_cpu(hdr->len);

	struct a2mp_cl *cl;

	u16 ext_feat;



	if (len < sizeof(*rsp))

		return -EINVAL;



	len -= sizeof(*rsp);

	skb_pull(skb, sizeof(*rsp));



	ext_feat = le16_to_cpu(rsp->ext_feat);



	BT_DBG("mtu %d efm 0x%4.4x", le16_to_cpu(rsp->mtu), ext_feat);



	/* check that packet is not broken for now */

	while (ext_feat & A2MP_FEAT_EXT) {

		if (len < sizeof(ext_feat))

			return -EINVAL;



		ext_feat = get_unaligned_le16(skb->data);

		BT_DBG("efm 0x%4.4x", ext_feat);

		len -= sizeof(ext_feat);

		skb_pull(skb, sizeof(ext_feat));

	}



	cl = (void *) skb->data;

	while (len >= sizeof(*cl)) {

		BT_DBG("Remote AMP id %d type %d status %d", cl->id, cl->type,

		       cl->status);



		if (cl->id != HCI_BREDR_ID && cl->type == HCI_AMP) {

			struct a2mp_info_req req;



			req.id = cl->id;

			a2mp_send(mgr, A2MP_GETINFO_REQ, __next_ident(mgr),

				  sizeof(req), &req);

		}



		len -= sizeof(*cl);

		cl = (void *) skb_pull(skb, sizeof(*cl));

	}



	return 0;

}



static int a2mp_change_notify(struct amp_mgr *mgr, struct sk_buff *skb,

			      struct a2mp_cmd *hdr)

{
@@ -391,8 +448,11 @@ static int a2mp_chan_recv_cb(struct l2cap_chan *chan, struct sk_buff *skb) 
			err = a2mp_discphyslink_req(mgr, skb, hdr);

			break;



		case A2MP_CHANGE_RSP:

		case A2MP_DISCOVER_RSP:

			err = a2mp_discover_rsp(mgr, skb, hdr);

			break;



		case A2MP_CHANGE_RSP:

		case A2MP_GETINFO_RSP:

		case A2MP_GETAMPASSOC_RSP:

		case A2MP_CREATEPHYSLINK_RSP: