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

Commit f0946ccf authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Marcel Holtmann
Browse files

Bluetooth: Move set of P-bit to l2cap_send_sframe() 



Abstract the send of of P-bit and avoids code duplication like we
did with the setting of F-bit.

Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
Reviewed-by: default avatarJoão Paulo Rechi Vita <jprvita@profusion.mobi>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 9e917af1

net/bluetooth/l2cap.c

+5 −4
Original line number Diff line number Diff line
@@ -357,6 +357,11 @@ static inline int l2cap_send_sframe(struct l2cap_pinfo *pi, u16 control) 
		pi->conn_state &= ~L2CAP_CONN_SEND_FBIT;

	}



	if (pi->conn_state & L2CAP_CONN_SEND_PBIT) {

		control |= L2CAP_CTRL_POLL;

		pi->conn_state &= ~L2CAP_CONN_SEND_PBIT;

	}



	skb = bt_skb_alloc(count, GFP_ATOMIC);

	if (!skb)

		return -ENOMEM;
@@ -3364,10 +3369,6 @@ static void l2cap_send_srejframe(struct sock *sk, u8 tx_seq) 
	while (tx_seq != pi->expected_tx_seq) {

		control = L2CAP_SUPER_SELECT_REJECT;

		control |= pi->expected_tx_seq << L2CAP_CTRL_REQSEQ_SHIFT;

		if (pi->conn_state & L2CAP_CONN_SEND_PBIT) {

			control |= L2CAP_CTRL_POLL;

			pi->conn_state &= ~L2CAP_CONN_SEND_PBIT;

		}

		l2cap_send_sframe(pi, control);



		new = kzalloc(sizeof(struct srej_list), GFP_ATOMIC);