From 24c4a0f75c51c1f42cc0125a024b7c262e664ff7 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Thu, 21 Apr 2016 15:43:29 -0700 Subject: [PATCH] Revert "tcp: Fix IPV6 module build errors" This reverts commit 3823c8136f2170b3ac5e6a5f8b857746a786e845. --- net/ipv4/tcp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index b799f20387c6..c0e0fd2dd378 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3260,7 +3260,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); @@ -3328,7 +3328,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) @@ -3365,4 +3365,3 @@ restart: return 0; } -EXPORT_SYMBOL_GPL(tcp_nuke_addr);