diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 09:39:23 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 09:39:23 +1100 |
| commit | 3b21b60f7123624541347b9754cbe834a701241f (patch) | |
| tree | edf6eff16ccef15e225720f486a16997f8171f36 /include/net | |
| parent | 21ec33c66777f045c5475a4cb6dde5608f3f7db8 (diff) | |
| parent | 59479ae85e43a364d3380f82b1ddd8d04d13bd31 (diff) | |
Merge remote-tracking branch 'vfs/for-next'
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/tcp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 6061963cca98..73a85e34e38c 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -358,7 +358,7 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb, void tcp_rcv_space_adjust(struct sock *sk); int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp); void tcp_twsk_destructor(struct sock *sk); -ssize_t tcp_splice_read(struct socket *sk, loff_t *ppos, +ssize_t tcp_splice_read(struct file *file, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags); |