diff options
| author | Pavel Emelyanov <xemul@parallels.com> | 2012-05-10 03:49:41 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-11 05:24:35 +0200 |
| commit | 292e8d8c853889140ed77b7b37c66979b13080ae (patch) | |
| tree | 7b5c1e110d68904277826e13c9daed638fef618d /include/net | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh... (diff) | |
| download | linux-292e8d8c853889140ed77b7b37c66979b13080ae.tar.xz linux-292e8d8c853889140ed77b7b37c66979b13080ae.zip | |
tcp: Move rcvq sending to tcp_input.c
It actually works on the input queue and will use its read mem
routines, thus it's better to have in in the tcp_input.c file.
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/tcp.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 92faa6a7ea97..aaf5de9448c9 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -432,8 +432,7 @@ extern int tcp_disconnect(struct sock *sk, int flags); void tcp_connect_init(struct sock *sk); void tcp_finish_connect(struct sock *sk, struct sk_buff *skb); -int __must_check tcp_queue_rcv(struct sock *sk, struct sk_buff *skb, - int hdrlen, bool *fragstolen); +int tcp_send_rcvq(struct sock *sk, struct msghdr *msg, size_t size); /* From syncookies.c */ extern __u32 syncookie_secret[2][16-4+SHA_DIGEST_WORDS]; |