From: Tushar Behera Date: Wed, 26 Mar 2014 09:57:05 +0000 (+0530) Subject: tcp: Fix build error if IPV6 is not selected X-Git-Tag: firefly_0821_release~3680^2~4^2~30^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7c0084dc990637bc6cc4eeccf9870dc834749220;p=firefly-linux-kernel-4.4.55.git tcp: Fix build error if IPV6 is not selected If CONFIG_IPV6=m is selected, we are getting following build errors. net/built-in.o: In function `tcp_is_local6': net/ipv4/tcp.c:3261: undefined reference to `rt6_lookup' Making the code conditional upon only CONFIG_IPV6=y fixes this issue. Signed-off-by: Tushar Behera CC: John Stultz Signed-off-by: John Stultz --- diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 880d2a644ca2..7921d1abc449 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3471,7 +3471,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); @@ -3528,7 +3528,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)