Bluetooth: A2MP: Manage incoming connections (97e8e89d) · Commits · 戴 / test

include/net/bluetooth/a2mp.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		#ifndef __A2MP_H
		#define __A2MP_H

		#include <net/bluetooth/l2cap.h>

		#define A2MP_FEAT_EXT 0x8000

		struct amp_mgr {
		@@ -118,5 +120,7 @@ struct a2mp_physlink_rsp {

		void amp_mgr_get(struct amp_mgr *mgr);
		int amp_mgr_put(struct amp_mgr *mgr);
		struct l2cap_chan a2mp_channel_create(struct l2cap_conn conn,
		struct sk_buff *skb);

		#endif /* __A2MP_H */

+16 −0

Original line number	Diff line number	Diff line
		@@ -569,3 +569,19 @@ static struct amp_mgr amp_mgr_create(struct l2cap_conn conn)

		return mgr;
		}

		struct l2cap_chan a2mp_channel_create(struct l2cap_conn conn,
		struct sk_buff *skb)
		{
		struct amp_mgr *mgr;

		mgr = amp_mgr_create(conn);
		if (!mgr) {
		BT_ERR("Could not create AMP manager");
		return NULL;
		}

		BT_DBG("mgr: %p chan %p", mgr, mgr->a2mp_chan);

		return mgr->a2mp_chan;
		}

+15 −4

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@
		#include <net/bluetooth/hci_core.h>
		#include <net/bluetooth/l2cap.h>
		#include <net/bluetooth/smp.h>
		#include <net/bluetooth/a2mp.h>

		bool disable_ertm;

		@@ -5132,11 +5133,21 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk

		chan = l2cap_get_chan_by_scid(conn, cid);
		if (!chan) {
		if (cid == L2CAP_CID_A2MP) {
		chan = a2mp_channel_create(conn, skb);
		if (!chan) {
		kfree_skb(skb);
		return 0;
		}

		l2cap_chan_lock(chan);
		} else {
		BT_DBG("unknown cid 0x%4.4x", cid);
		/* Drop packet and return */
		kfree_skb(skb);
		return 0;
		}
		}

		BT_DBG("chan %p, len %d", chan, skb->len);