projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7f3c0b7
)
Revert "Don't kill IPv4 sockets when killing IPv6 sockets was requested."
author
Dmitry Shmidt
<dimitrysh@google.com>
Thu, 21 Apr 2016 22:43:58 +0000
(15:43 -0700)
committer
Amit Pundir
<amit.pundir@linaro.org>
Thu, 19 May 2016 07:02:41 +0000
(12:32 +0530)
This reverts commit
8bf4413b4f54e24120b90ecbfee426beeddc3ff0
.
net/ipv4/tcp.c
patch
|
blob
|
history
diff --git
a/net/ipv4/tcp.c
b/net/ipv4/tcp.c
index e23f2c529ecad9fc77d37f59ffdea6ad6e5ca600..edd1312ba73d7eb3b33fbca08f1c788df3938097 100644
(file)
--- a/
net/ipv4/tcp.c
+++ b/
net/ipv4/tcp.c
@@
-3335,8
+3335,6
@@
restart:
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
if (family == AF_INET6) {
struct in6_addr *s6;
- if (!inet->pinet6)
- continue;
s6 = &sk->sk_v6_rcv_saddr;
if (ipv6_addr_type(s6) == IPV6_ADDR_MAPPED)