Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / net / tls / tls_sw.c

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index db585964b52bdee4a8b6a3c84e4009f4c7567a1b..53b4ad94e74ab0aecb964ce0ed482c9277654d47 100644 (file)
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -1959,7 +1959,8 @@ bool tls_sw_stream_read(const struct sock *sk)
                ingress_empty = list_empty(&psock->ingress_msg);
        rcu_read_unlock();
 
-       return !ingress_empty || ctx->recv_pkt;
+       return !ingress_empty || ctx->recv_pkt ||
+               !skb_queue_empty(&ctx->rx_list);
 }
 
 static int tls_read_size(struct strparser *strp, struct sk_buff *skb)