From 751a97d79950bf82e83f57f6e16d96418a2789f8 Mon Sep 17 00:00:00 2001 From: Vlad Yasevich Date: Thu, 15 Nov 2012 16:34:57 +0000 Subject: [PATCH] net: Make IPv6 build depend on CONFIG_INET IPv6 build selection currently controlled by CONFIG_NET, so it is possible to build IPv6 functinality without selectiona any TCP/IP features (CONFIG_INET). Make IPv6 be consistent with IPv4. This should resolve the following issue: net/built-in.o: In function `tcp6_gro_complete': tcpv6_offload.c:(.text+0x3d045): undefined reference to `tcp_gro_complete' net/built-in.o: In function `tcp6_gro_receive': tcpv6_offload.c:(.text+0x3d19b): undefined reference to `tcp_gro_receive' net/built-in.o: In function `ipv6_exthdrs_offload_init': (.init.text+0x118b): undefined reference to `inet_del_offload' net/built-in.o:(.rodata+0x1c58): undefined reference to `tcp_tso_segment' Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller --- net/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/Makefile b/net/Makefile index 4f4ee083064c..e050d9d205e7 100644 --- a/net/Makefile +++ b/net/Makefile @@ -19,7 +19,7 @@ obj-$(CONFIG_NETFILTER) += netfilter/ obj-$(CONFIG_INET) += ipv4/ obj-$(CONFIG_XFRM) += xfrm/ obj-$(CONFIG_UNIX) += unix/ -obj-$(CONFIG_NET) += ipv6/ +obj-$(CONFIG_INET) += ipv6/ obj-$(CONFIG_PACKET) += packet/ obj-$(CONFIG_NET_KEY) += key/ obj-$(CONFIG_BRIDGE) += bridge/ -- 2.20.1