Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75fe83c3 authored by Vlad Yasevich's avatar Vlad Yasevich Committed by David S. Miller
Browse files

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: default avatarVlad Yasevich <vyasevic@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6d973cb1

net/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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/

net/ipv6/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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