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

Commit 50a147cd authored by Mat Martineau's avatar Mat Martineau Committed by Gustavo Padovan
Browse files

Bluetooth: Use symbolic values for the fixed channel map 



The A2MP fixed channel bit is only set when high-speed mode is enabled.

Signed-off-by: default avatarMat Martineau <mathewm@codeaurora.org>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Acked-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent d835ac0f

net/bluetooth/l2cap_core.c

+7 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ int disable_ertm; 
int enable_hs;



static u32 l2cap_feat_mask = L2CAP_FEAT_FIXED_CHAN;

static u8 l2cap_fixed_chan[8] = { 0x02, };

static u8 l2cap_fixed_chan[8] = { L2CAP_FC_L2CAP, };



static LIST_HEAD(chan_list);

static DEFINE_RWLOCK(chan_list_lock);
@@ -3035,6 +3035,12 @@ static inline int l2cap_information_req(struct l2cap_conn *conn, struct l2cap_cm 
	} else if (type == L2CAP_IT_FIXED_CHAN) {

		u8 buf[12];

		struct l2cap_info_rsp *rsp = (struct l2cap_info_rsp *) buf;



		if (enable_hs)

			l2cap_fixed_chan[0] |= L2CAP_FC_A2MP;

		else

			l2cap_fixed_chan[0] &= ~L2CAP_FC_A2MP;



		rsp->type   = cpu_to_le16(L2CAP_IT_FIXED_CHAN);

		rsp->result = cpu_to_le16(L2CAP_IR_SUCCESS);

		memcpy(rsp->data, l2cap_fixed_chan, sizeof(l2cap_fixed_chan));