From: Dmitry Shmidt <dimitrysh@google.com>
Date: Thu, 21 Apr 2016 22:43:58 +0000 (-0700)
Subject: Revert "Don't kill IPv4 sockets when killing IPv6 sockets was requested."
X-Git-Tag: firefly_0821_release~176^2~399^2~35
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=99bbdddee077677da9acc8dd340ab206781f8614;p=firefly-linux-kernel-4.4.55.git

Revert "Don't kill IPv4 sockets when killing IPv6 sockets was requested."

This reverts commit 8bf4413b4f54e24120b90ecbfee426beeddc3ff0.
---

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index e23f2c529eca..edd1312ba73d 100644
--- 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)