Merge tag 'v3.10.55' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / bluetooth / rfcomm / core.c

diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index 0c77476d33d2043f388da49a7fe8545418760e96..3ca5e40fe3908f5bc0e362ce27d8edf39519790b 100644 (file)
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -1856,10 +1856,13 @@ static struct rfcomm_session *rfcomm_process_rx(struct rfcomm_session *s)
        /* Get data directly from socket receive queue without copying it. */
        while ((skb = skb_dequeue(&sk->sk_receive_queue))) {
                skb_orphan(skb);
        /* Get data directly from socket receive queue without copying it. */
        while ((skb = skb_dequeue(&sk->sk_receive_queue))) {
                skb_orphan(skb);

-               if (!skb_linearize(skb))
+               if (!skb_linearize(skb)) {

                        s = rfcomm_recv_frame(s, skb);
                        s = rfcomm_recv_frame(s, skb);

-               else
+                       if (!s)
+                               break;
+               } else {

                        kfree_skb(skb);
                        kfree_skb(skb);

+               }

        }
 
        if (s && (sk->sk_state == BT_CLOSED))
        }
 
        if (s && (sk->sk_state == BT_CLOSED))