Commit c9e3d5e0 authored by Mat Martineau's avatar Mat Martineau Committed by Johan Hedberg
Browse files

Bluetooth: Use new header structures in l2cap_send_rr_or_rnr 



struct l2cap_ctrl is now used, and the sframe is now sent directly
rather than depending on a separate call.

Signed-off-by: default avatarMat Martineau <mathewm@codeaurora.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent fcd289df

net/bluetooth/l2cap_core.c

+15 −7
Original line number Diff line number Diff line
@@ -920,15 +920,23 @@ static void l2cap_send_sframe(struct l2cap_chan *chan, 
		l2cap_do_send(chan, skb);

}



static inline void l2cap_send_rr_or_rnr(struct l2cap_chan *chan, u32 control)

static void l2cap_send_rr_or_rnr(struct l2cap_chan *chan, bool poll)

{

	if (test_bit(CONN_LOCAL_BUSY, &chan->conn_state)) {

		control |= __set_ctrl_super(chan, L2CAP_SUPER_RNR);

		set_bit(CONN_RNR_SENT, &chan->conn_state);

	} else

		control |= __set_ctrl_super(chan, L2CAP_SUPER_RR);

	struct l2cap_ctrl control;



	BT_DBG("chan %p, poll %d", chan, poll);



	memset(&control, 0, sizeof(control));

	control.sframe = 1;

	control.poll = poll;



	control |= __set_reqseq(chan, chan->buffer_seq);

	if (test_bit(CONN_LOCAL_BUSY, &chan->conn_state))

		control.super = L2CAP_SUPER_RNR;

	else

		control.super = L2CAP_SUPER_RR;



	control.reqseq = chan->buffer_seq;

	l2cap_send_sframe(chan, &control);

}



static inline int __l2cap_no_conn_pending(struct l2cap_chan *chan)

CRA Git | Maintained and supported by SUSTech CRA and CCSE