diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-02-17 10:37:36 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-02-17 10:37:36 +0100 |
commit | 9109dc97b0155e500cdf3bcd91507bc24defefc1 (patch) | |
tree | 5d721cbfeb3576dc6969093ab04f17666737b6a4 /include/net/tcp.h | |
parent | 27f6d22b037b2be6685e0e27cce929779d634119 (diff) | |
parent | 059fcd8cd16622da6513804a7a3e826d152c6c96 (diff) |
Merge branch 'perf/urgent' into perf/core, to queue up dependent patch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 f6f8f032c73e8..ae6468f5c9f37 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -447,7 +447,7 @@ const u8 *tcp_parse_md5sig_option(const struct tcphdr *th); void tcp_v4_send_check(struct sock *sk, struct sk_buff *skb); void tcp_v4_mtu_reduced(struct sock *sk); -void tcp_req_err(struct sock *sk, u32 seq); +void tcp_req_err(struct sock *sk, u32 seq, bool abort); int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb); struct sock *tcp_create_openreq_child(const struct sock *sk, struct request_sock *req, |