diff options
author | Mark Brown <broonie@kernel.org> | 2018-07-25 17:34:18 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-07-25 17:34:18 +0100 |
commit | 8c9257333713c1f185693fe0df2df79dfc1fa1c8 (patch) | |
tree | 60d7fb9170d3cf462685be490b59bf1c012389d3 /net/ipv4/tcp.c | |
parent | 953cb6f07855d41f79b6faa2f334d11116d54afb (diff) | |
parent | dbcdf42bab53d219caa51bcfe54c8b9066010290 (diff) |
Merge tag 'v4.9.115' into linux-linaro-lsk-v4.9lsk-v4.9-18.07
This is the 4.9.115 stable release
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r-- | net/ipv4/tcp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 84ffebf0192d..8f15eae3325b 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3238,8 +3238,7 @@ int tcp_abort(struct sock *sk, int err) struct request_sock *req = inet_reqsk(sk); local_bh_disable(); - inet_csk_reqsk_queue_drop_and_put(req->rsk_listener, - req); + inet_csk_reqsk_queue_drop(req->rsk_listener, req); local_bh_enable(); return 0; } |