Merge branch 'akpm' (patches from Andrew)

[cascardo/linux.git] / net / ipv4 / tcp.c

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index ab984d2..3251fe7 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -689,8 +689,7 @@ static int tcp_splice_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb,
        int ret;
 
        ret = skb_splice_bits(skb, skb->sk, offset, tss->pipe,
        int ret;
 
        ret = skb_splice_bits(skb, skb->sk, offset, tss->pipe,

-                             min(rd_desc->count, len), tss->flags,
-                             skb_socket_splice);
+                             min(rd_desc->count, len), tss->flags);

        if (ret > 0)
                rd_desc->count -= ret;
        return ret;
        if (ret > 0)
                rd_desc->count -= ret;
        return ret;