evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "tcp: Fix IPV6 module build errors"

Browse source 
This reverts commit 3823c8136f.
This commit is contained in:
Dmitry Shmidt 2016-04-21 15:43:29 -07:00
parent a9de512978
commit 24c4a0f75c
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
net/ipv4/tcp.c
View file

@ -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);