From: Ruiyi Zhang Date: Fri, 13 May 2011 05:07:52 +0000 (+0800) Subject: Bluetooth: Allow unsegmented SDU retries on sock_queue_rcv_skb failure X-Git-Tag: 2.1b_release~2521 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f40fc6731f79e040381bf887cfa6e4d9e8c90c52;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git 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 Signed-off-by: Gustavo F. Padovan --- diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 8b87947..64c0016 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -2929,11 +2929,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)