Revert "tcp: Fix IPV6 module build errors" (24c4a0f7) · Commits · e / devices / android_kernel_sony_msm8998

net/ipv4/tcp.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -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);