summaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorVlad Yasevich <vyasevic@redhat.com>2012-11-16 09:41:21 +0000
committerDavid S. Miller <davem@davemloft.net>2012-11-18 02:34:00 -0500
commit75fe83c32248d99e6d5fe64155e519b78bb90481 (patch)
treec001b2286fcbc15c9683d6f6b8f74091380b7afc /net/ipv6
parent6d973cb163aede0b4a414abfda42d1bc35bfd7f9 (diff)
downloadblackbird-op-linux-75fe83c32248d99e6d5fe64155e519b78bb90481.tar.gz
blackbird-op-linux-75fe83c32248d99e6d5fe64155e519b78bb90481.zip
ipv6: Preserve ipv6 functionality needed by NET
Some pieces of network use core pieces of IPv6 stack. Keep them available while letting new GSO offload pieces depend on CONFIG_INET. Signed-off-by: Vlad Yasevich <vyasevic@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile
index 04a475df98ad..2068ac4fbdad 100644
--- a/net/ipv6/Makefile
+++ b/net/ipv6/Makefile
@@ -40,7 +40,7 @@ obj-$(CONFIG_IPV6_SIT) += sit.o
obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o
obj-$(CONFIG_IPV6_GRE) += ip6_gre.o
-obj-y += addrconf_core.o exthdrs_core.o output_core.o protocol.o
-obj-y += $(ipv6-offload)
+obj-y += addrconf_core.o exthdrs_core.o
+obj-$(CONFIG_INET) += output_core.o protocol.o $(ipv6_offload)
obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o
OpenPOWER on IntegriCloud