summaryrefslogtreecommitdiff
path: root/include/net/tcp.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-10-23 13:30:47 +0200
committerIngo Molnar <mingo@kernel.org>2017-10-23 13:30:47 +0200
commitf95b23a112f1a31ea042483540cd907b58d23a5f (patch)
tree3d41d2f8cf1d66ed593deb12f25a30d2905eb077 /include/net/tcp.h
parentda20ab35180780e4a6eadc804544f1fa967f3567 (diff)
parent58c3862b521ead4f69a24ef009a679cb3c519620 (diff)
Merge branch 'x86/urgent' into x86/asm, to pick up dependent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/net/tcp.h')
-rw-r--r--include/net/tcp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 3bc910a9bfc6..89974c5286d8 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -345,7 +345,7 @@ void tcp_v4_err(struct sk_buff *skb, u32);
void tcp_shutdown(struct sock *sk, int how);
-void tcp_v4_early_demux(struct sk_buff *skb);
+int tcp_v4_early_demux(struct sk_buff *skb);
int tcp_v4_rcv(struct sk_buff *skb);
int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw);