Commit 224f8af0 authored May 13, 2011 by Ruiyi Zhang Committed by Gustavo F. Padovan Jun 08, 2011

Bluetooth: Allow unsegmented SDU retries on sock_queue_rcv_skb failure



In L2CAP_SDU_UNSEGMENTED case, if sock_queue_rcv_skb returns error,
l2cap_ertm_reassembly_sdu should not return 0 so as to insert the
skb into BUSY_QUEUE for later retries.

Signed-off-by: Ruiyi Zhang <Ruiyi.Zhang@Atheros.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

parent 931749bf

net/bluetooth/l2cap_core.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -2928,11 +2928,7 @@ static int l2cap_ertm_reassembly_sdu(struct l2cap_chan chan, struct sk_buff sk
		if (chan->conn_state & L2CAP_CONN_SAR_SDU)
		goto drop;

		err = sock_queue_rcv_skb(chan->sk, skb);
		if (!err)
		return err;

		break;
		return sock_queue_rcv_skb(chan->sk, skb);

		case L2CAP_SDU_START:
		if (chan->conn_state & L2CAP_CONN_SAR_SDU)

Admin message