summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2016-04-21 15:43:58 -0700
committerDmitry Shmidt <dimitrysh@google.com>2016-04-21 15:43:58 -0700
commit215856823c282d0339acdad8c7f154abc30d1027 (patch)
treea250306e84ad2f5aaad219b7eefa5f380f799e48
parent24c4a0f75c51c1f42cc0125a024b7c262e664ff7 (diff)
Revert "Don't kill IPv4 sockets when killing IPv6 sockets was requested."
This reverts commit 8bf4413b4f54e24120b90ecbfee426beeddc3ff0.
-rw-r--r--net/ipv4/tcp.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index c0e0fd2dd378..9819762c4a92 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3331,8 +3331,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)