projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'regulator/topic/lp3972' into regulator-next
[firefly-linux-kernel-4.4.55.git]
/
net
/
dccp
/
ipv6.c
diff --git
a/net/dccp/ipv6.c
b/net/dccp/ipv6.c
index 56840b249f3b6a13c9b9a842af3e29f5b490b355..6e05981f271e554ef4ddde25bb4029c7e3e95933 100644
(file)
--- a/
net/dccp/ipv6.c
+++ b/
net/dccp/ipv6.c
@@
-585,7
+585,8
@@
static struct sock *dccp_v6_request_recv_sock(struct sock *sk,
newinet->inet_rcv_saddr = LOOPBACK4_IPV6;
if (__inet_inherit_port(sk, newsk) < 0) {
- sock_put(newsk);
+ inet_csk_prepare_forced_close(newsk);
+ dccp_done(newsk);
goto out;
}
__inet6_hash(newsk, NULL);