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

Commit ccbb84af authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Bluetooth: Simplify L2CAP Streaming mode sending 



As we don't have any error control on the Streaming mode, i.e., we don't
need to keep a copy of the skb for later resending we don't need to
call skb_clone() on it.
Then we can go one further here, and dequeue the skb before sending it,
that also means we don't need to look to sk->sk_send_head anymore.

The patch saves memory and time when sending Streaming mode data, so
it is good to mainline.

Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 8183b775

net/bluetooth/l2cap.c

+7 −17
Original line number Diff line number Diff line
@@ -1441,33 +1441,23 @@ static inline void l2cap_do_send(struct sock *sk, struct sk_buff *skb) 


static void l2cap_streaming_send(struct sock *sk)

{

	struct sk_buff *skb, *tx_skb;

	struct sk_buff *skb;

	struct l2cap_pinfo *pi = l2cap_pi(sk);

	u16 control, fcs;



	while ((skb = sk->sk_send_head)) {

		tx_skb = skb_clone(skb, GFP_ATOMIC);



		control = get_unaligned_le16(tx_skb->data + L2CAP_HDR_SIZE);

	while ((skb = skb_dequeue(TX_QUEUE(sk)))) {

		control = get_unaligned_le16(skb->data + L2CAP_HDR_SIZE);

		control |= pi->next_tx_seq << L2CAP_CTRL_TXSEQ_SHIFT;

		put_unaligned_le16(control, tx_skb->data + L2CAP_HDR_SIZE);

		put_unaligned_le16(control, skb->data + L2CAP_HDR_SIZE);



		if (pi->fcs == L2CAP_FCS_CRC16) {

			fcs = crc16(0, (u8 *)tx_skb->data, tx_skb->len - 2);

			put_unaligned_le16(fcs, tx_skb->data + tx_skb->len - 2);

			fcs = crc16(0, (u8 *)skb->data, skb->len - 2);

			put_unaligned_le16(fcs, skb->data + skb->len - 2);

		}



		l2cap_do_send(sk, tx_skb);

		l2cap_do_send(sk, skb);



		pi->next_tx_seq = (pi->next_tx_seq + 1) % 64;



		if (skb_queue_is_last(TX_QUEUE(sk), skb))

			sk->sk_send_head = NULL;

		else

			sk->sk_send_head = skb_queue_next(TX_QUEUE(sk), skb);



		skb = skb_dequeue(TX_QUEUE(sk));

		kfree_skb(skb);

	}

}