diff options
| author | Corey Minyard <cminyard@mvista.com> | 2017-11-02 19:19:15 +0300 |
|---|---|---|
| committer | Corey Minyard <cminyard@mvista.com> | 2017-11-02 19:19:15 +0300 |
| commit | 6297fabd93f93182245383ba7de56bef829a796b (patch) | |
| tree | 804f5d28ada61b402d56281c9a047308d26347f4 /include/net/tcp.h | |
| parent | d7e17fe4f7a7d961cc4375c7d868bd353a039bc7 (diff) | |
| parent | ece1996a21eeb344b49200e627c6660111009c10 (diff) | |
| download | linux-6297fabd93f93182245383ba7de56bef829a796b.tar.xz | |
Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux into for-next
The IPMI SI driver was split into different pieces, merge the module
tree to accountfor that.
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Diffstat (limited to 'include/net/tcp.h')
| -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 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); |