diff options
| author | Vlad Yasevich <vyasevic@redhat.com> | 2012-11-16 10:41:21 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-18 08:34:00 +0100 |
| commit | 75fe83c32248d99e6d5fe64155e519b78bb90481 (patch) | |
| tree | c001b2286fcbc15c9683d6f6b8f74091380b7afc /net | |
| parent | qlcnic: fix sparse warnings (diff) | |
| download | linux-75fe83c32248d99e6d5fe64155e519b78bb90481.tar.xz 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')
| -rw-r--r-- | net/Makefile | 2 | ||||
| -rw-r--r-- | net/ipv6/Makefile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/Makefile b/net/Makefile index e050d9d205e7..4f4ee083064c 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_INET) += ipv6/ +obj-$(CONFIG_NET) += ipv6/ obj-$(CONFIG_PACKET) += packet/ obj-$(CONFIG_NET_KEY) += key/ obj-$(CONFIG_BRIDGE) += bridge/ 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 |