diff options
| author | John W. Linville <[email protected]> | 2014-07-29 10:32:36 -0400 |
|---|---|---|
| committer | John W. Linville <[email protected]> | 2014-07-29 10:32:36 -0400 |
| commit | a1ae52c203417a4e6aca01a5e8955d74fc7b3d0a (patch) | |
| tree | 48ac79fee7d145f0c31c28bb09c9c066caf48170 /net/bluetooth/rfcomm/core.c | |
| parent | 0da4cc6e624675c721e15cd7440ccd65b154f685 (diff) | |
| parent | 3bd2724010a51d5d15afa8065ac3c5fab3725499 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'net/bluetooth/rfcomm/core.c')
| -rw-r--r-- | net/bluetooth/rfcomm/core.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index a0690a84f3e9..af73bc3acb40 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -1910,10 +1910,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); - if (!skb_linearize(skb)) + if (!skb_linearize(skb)) { s = rfcomm_recv_frame(s, skb); - else + if (!s) + break; + } else { kfree_skb(skb); + } } if (s && (sk->sk_state == BT_CLOSED)) |