diff options
| author | Tom Herbert <tom@herbertland.com> | 2016-08-28 14:43:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-28 23:32:41 -0400 |
| commit | 0294b625ad5a6d1fb50632d67cf384862d8a4a46 (patch) | |
| tree | 2807436d5a82ed273a11b0706e81fce6899f1fe8 /include | |
| parent | e19ac1578fd8eb3f7c93f2be2657deb2ccefffd7 (diff) | |
| download | linux-0294b625ad5a6d1fb50632d67cf384862d8a4a46.tar.gz linux-0294b625ad5a6d1fb50632d67cf384862d8a4a46.tar.bz2 linux-0294b625ad5a6d1fb50632d67cf384862d8a4a46.zip | |
net: Add read_sock proto_op
Add new function in proto_ops structure. This includes moving the
typedef got sk_read_actor into net.h and removing the definition from
tcp.h.
Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/net.h | 6 | ||||
| -rw-r--r-- | include/net/tcp.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index b9f0ff4d489c..cd0c8bd0a1de 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -25,6 +25,7 @@ #include <linux/kmemcheck.h> #include <linux/rcupdate.h> #include <linux/once.h> +#include <linux/fs.h> #include <uapi/linux/net.h> @@ -128,6 +129,9 @@ struct page; struct sockaddr; struct msghdr; struct module; +struct sk_buff; +typedef int (*sk_read_actor_t)(read_descriptor_t *, struct sk_buff *, + unsigned int, size_t); struct proto_ops { int family; @@ -186,6 +190,8 @@ struct proto_ops { 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); + int (*read_sock)(struct sock *sk, read_descriptor_t *desc, + sk_read_actor_t recv_actor); }; #define DECLARE_SOCKADDR(type, dst, src) \ diff --git a/include/net/tcp.h b/include/net/tcp.h index 25d64f6de69e..d56666ad9249 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -603,8 +603,6 @@ static inline int tcp_bound_to_half_wnd(struct tcp_sock *tp, int pktsize) void tcp_get_info(struct sock *, struct tcp_info *); /* Read 'sendfile()'-style from a TCP socket */ -typedef int (*sk_read_actor_t)(read_descriptor_t *, struct sk_buff *, - unsigned int, size_t); int tcp_read_sock(struct sock *sk, read_descriptor_t *desc, sk_read_actor_t recv_actor); |