diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2011-09-14 11:15:08 +0159 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2011-09-14 11:15:08 +0159 |
| commit | cd08fdeccacea18b1f1ee26b1c4bd8c5c02796d7 (patch) | |
| tree | 579cd458699b9c344ab27165efe0a62cf16171ed | |
| parent | 43b5147ffbb0acb3bef2de24702d330b83238ac1 (diff) | |
| download | imx53-cd08fdeccacea18b1f1ee26b1c4bd8c5c02796d7.tar.gz | |
Fix build
| -rw-r--r-- | net/ipv4/tcp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 5eb7af23461..53c98f266f6 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3333,7 +3333,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) //|| 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->rt6i_dev && (rt6->rt6i_dev->flags & IFF_LOOPBACK); @@ -3351,12 +3351,12 @@ int tcp_nuke_addr(struct net *net, struct sockaddr *addr) unsigned int bucket; struct in_addr *in; -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) +#if defined(CONFIG_IPV6) //|| defined(CONFIG_IPV6_MODULE) struct in6_addr *in6; #endif if (family == AF_INET) { in = &((struct sockaddr_in *)addr)->sin_addr; -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) +#if defined(CONFIG_IPV6) //|| defined(CONFIG_IPV6_MODULE) } else if (family == AF_INET6) { in6 = &((struct sockaddr_in6 *)addr)->sin6_addr; #endif @@ -3382,7 +3382,7 @@ restart: continue; } -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) +#if defined(CONFIG_IPV6) //|| defined(CONFIG_IPV6_MODULE) if (family == AF_INET6) { struct in6_addr *s6; if (!inet->pinet6) @@ -3420,3 +3420,4 @@ restart: return 0; } +EXPORT_SYMBOL_GPL(tcp_nuke_addr); // for IPv6 module |