diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-09-17 21:02:10 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-03 20:40:56 -0400 |
| commit | 25869262ef7af24ccde988867ac3eb1c3d4b88d4 (patch) | |
| tree | b625a7350e316e4fe2033e5689fb0bbc6b3e2973 /net/ipv4/tcp.c | |
| parent | 79fddc4efd5d4de5cf210fe5ecf4d2734140849a (diff) | |
| download | linux-25869262ef7af24ccde988867ac3eb1c3d4b88d4.tar.gz linux-25869262ef7af24ccde988867ac3eb1c3d4b88d4.tar.bz2 linux-25869262ef7af24ccde988867ac3eb1c3d4b88d4.zip | |
skb_splice_bits(): get rid of callback
since pipe_lock is the outermost now, we don't need to drop/regain
socket locks around the call of splice_to_pipe() from skb_splice_bits(),
which kills the need to have a socket-specific callback; we can just
call splice_to_pipe() and be done with that.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index ffbb218de520..ddd2179538f7 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -688,8 +688,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, - 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; |