diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-02-22 08:26:05 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-02-22 08:26:05 +0100 |
commit | ab876728a91d89e93e4928895529cd5bb4dff6e4 (patch) | |
tree | 3aa7603c289f79a570cf15e4019b1acb9459e608 /include/net/tcp.h | |
parent | 35575e0e8ba633fc8276509a21f89b599b4f9006 (diff) | |
parent | 81f70ba233d5f660e1ea5fe23260ee323af5d53a (diff) | |
download | linux-ab876728a91d89e93e4928895529cd5bb4dff6e4.tar.gz linux-ab876728a91d89e93e4928895529cd5bb4dff6e4.tar.bz2 linux-ab876728a91d89e93e4928895529cd5bb4dff6e4.zip |
Merge tag 'v4.5-rc5' into efi/core, before queueing up new changes
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 f6f8f032c73e..ae6468f5c9f3 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, |