diff options
| author |   Vlad Yasevich <vyasevic@redhat.com> | 2012-11-15 16:34:57 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-11-15 22:48:32 -0500 |
| commit | 751a97d79950bf82e83f57f6e16d96418a2789f8 (patch) | |
| tree | 8dba4cca1e6350f8c226f99b9de4c46e393af263 /net/Makefile | |
| parent | Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next (diff) | |
| download | linux-dev-751a97d79950bf82e83f57f6e16d96418a2789f8.tar.xz linux-dev-751a97d79950bf82e83f57f6e16d96418a2789f8.zip | |
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 <vyasvic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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/ |