diff options
| author | Mark Brown <broonie@linaro.org> | 2014-04-15 18:12:51 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-04-15 18:12:51 +0100 |
| commit | 3736e39e6a6e546d59f97aa6b6b040b118fe169f (patch) | |
| tree | 507fdc7d65e178390038853e1081031dd12c9804 /net/ipv4 | |
| parent | dca382e80b49447925d82eff22c716dadcbee09f (diff) | |
| parent | fc5c002a715ff92fa69ec3fd045568ddce47d538 (diff) | |
Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/john.stultz/android into linux-linaro-lsk-android
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 82e3928aae20..59e8bbc04d95 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3490,7 +3490,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) || defined(CONFIG_IPV6_MODULE) +#if defined(CONFIG_IPV6) 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); @@ -3547,7 +3547,7 @@ restart: continue; } -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) +#if defined(CONFIG_IPV6) if (family == AF_INET6) { struct in6_addr *s6; if (!inet->pinet6) |