From: Dmitry Shmidt <dimitrysh@google.com>
Date: Thu, 21 Apr 2016 22:43:29 +0000 (-0700)
Subject: Revert "tcp: Fix IPV6 module build errors"
X-Git-Tag: firefly_0821_release~176^2~399^2~36
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7f3c0b7b8a48d16707bc9d332b2dda175312ce50;p=firefly-linux-kernel-4.4.55.git

Revert "tcp: Fix IPV6 module build errors"

This reverts commit 3823c8136f2170b3ac5e6a5f8b857746a786e845.
---

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 7c0465202cc5..e23f2c529eca 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3264,7 +3264,7 @@ static int tcp_is_local(struct net *net, __be32 addr) {
 	return rt->dst.dev && (rt->dst.dev->flags & IFF_LOOPBACK);
 }
 
-#if defined(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 static int tcp_is_local6(struct net *net, struct in6_addr *addr) {
 	struct rt6_info *rt6 = rt6_lookup(net, addr, addr, 0, 0);
 	return rt6 && rt6->dst.dev && (rt6->dst.dev->flags & IFF_LOOPBACK);
@@ -3332,7 +3332,7 @@ restart:
 					continue;
 			}
 
-#if defined(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 			if (family == AF_INET6) {
 				struct in6_addr *s6;
 				if (!inet->pinet6)
@@ -3369,4 +3369,3 @@ restart:
 
 	return 0;
 }
-EXPORT_SYMBOL_GPL(tcp_nuke_addr);