diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-04-21 15:43:29 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-04-21 15:43:29 -0700 |
| commit | 24c4a0f75c51c1f42cc0125a024b7c262e664ff7 (patch) | |
| tree | 3ef2a2a8e8f7a6f88fe5f7fe0e9c2d3372880248 /net/ipv4/tcp.c | |
| parent | a9de5129787db0d135eab61359b820c783fb5676 (diff) | |
Revert "tcp: Fix IPV6 module build errors"
This reverts commit 3823c8136f2170b3ac5e6a5f8b857746a786e845.
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 5 |
1 files 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); |