diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-08-10 14:11:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-08-10 14:11:54 +0200 |
| commit | a2071cd765637002523798358d2ca441306d708b (patch) | |
| tree | bafac1682bfa91457439cad09d2eeea71f2ad3bf /include/linux/net.h | |
| parent | 784bdf3bb694b256fcd6120b93e8947a84249a3a (diff) | |
| parent | a0cba2179ea4c1820fce2ee046b6ed90ecc56196 (diff) | |
Merge branch 'linus' into locking/urgent, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/net.h')
| -rw-r--r-- | include/linux/net.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index 25aa03b51c4e..b9f0ff4d489c 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -185,6 +185,7 @@ struct proto_ops { ssize_t (*splice_read)(struct socket *sock, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags); int (*set_peek_off)(struct sock *sk, int val); + int (*peek_len)(struct socket *sock); }; #define DECLARE_SOCKADDR(type, dst, src) \ |