Patchwork [1/2] net: Make IPv6 build depend on CONFIG_INET

login
register
mail settings
Submitter Vlad Yasevich
Date Nov. 16, 2012, 2:34 a.m.
Message ID <1353033297-2724-1-git-send-email-vyasevic@redhat.com>
Download mbox | patch
Permalink /patch/199480/
State Accepted
Delegated to: David Miller
Headers show

Comments

Vlad Yasevich - Nov. 16, 2012, 2:34 a.m.
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 <vyasvic@redhat.com>
---
 net/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
David Miller - Nov. 16, 2012, 3:49 a.m.
From: Vlad Yasevich <vyasevic@redhat.com>
Date: Thu, 15 Nov 2012 21:34:57 -0500

> 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 <vyasvic@redhat.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/Makefile b/net/Makefile
index 4f4ee08..e050d9d 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/