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

Bluetooth: Don't set control bits to zero first 



We can set the SAR bits in the control field directly.

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 01760bdd

net/bluetooth/l2cap.c

+2 −4
Original line number Diff line number Diff line
@@ -1636,16 +1636,15 @@ static inline int l2cap_sar_segment_sdu(struct sock *sk, struct msghdr *msg, siz 
	__skb_queue_tail(&sar_queue, skb);

	len -= pi->remote_mps;

	size += pi->remote_mps;

	control = 0;



	while (len > 0) {

		size_t buflen;



		if (len > pi->remote_mps) {

			control |= L2CAP_SDU_CONTINUE;

			control = L2CAP_SDU_CONTINUE;

			buflen = pi->remote_mps;

		} else {

			control |= L2CAP_SDU_END;

			control = L2CAP_SDU_END;

			buflen = len;

		}
@@ -1658,7 +1657,6 @@ static inline int l2cap_sar_segment_sdu(struct sock *sk, struct msghdr *msg, siz 
		__skb_queue_tail(&sar_queue, skb);

		len -= buflen;

		size += buflen;

		control = 0;

	}

	skb_queue_splice_tail(&sar_queue, TX_QUEUE(sk));

	if (sk->sk_send_head == NULL)