forked from luck/tmp_suning_uos_patched
fabb13db44
A previous patch added the fou6.ko module, but that failed to link
in a couple of configurations:
net/built-in.o: In function `ip6_tnl_encap_add_fou_ops':
net/ipv6/fou6.c:88: undefined reference to `ip6_tnl_encap_add_ops'
net/ipv6/fou6.c:94: undefined reference to `ip6_tnl_encap_add_ops'
net/ipv6/fou6.c:97: undefined reference to `ip6_tnl_encap_del_ops'
net/built-in.o: In function `ip6_tnl_encap_del_fou_ops':
net/ipv6/fou6.c:106: undefined reference to `ip6_tnl_encap_del_ops'
net/ipv6/fou6.c:107: undefined reference to `ip6_tnl_encap_del_ops'
If CONFIG_IPV6=m, ip6_tnl_encap_add_ops/ip6_tnl_encap_del_ops
are in a module, but fou6.c can still be built-in, and that
obviously fails to link.
Also, if CONFIG_IPV6=y, but CONFIG_IPV6_TUNNEL=m or
CONFIG_IPV6_TUNNEL=n, the same problem happens for a different
reason.
This adds two new silent Kconfig symbols to work around both
problems:
- CONFIG_IPV6_FOU is now always set to 'm' if either CONFIG_NET_FOU=m
or CONFIG_IPV6=m
- CONFIG_IPV6_FOU_TUNNEL is set implicitly when IPV6_FOU is enabled
and NET_FOU_IP_TUNNELS is also turned out, and it will ensure
that CONFIG_IPV6_TUNNEL is also available.
The options could be made user-visible as well, to give additional
room for configuration, but it seems easier not to bother users
with more choice here.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: aa3463d65e ("fou: Add encap ops for IPv6 tunnels")
Signed-off-by: David S. Miller <davem@davemloft.net>
56 lines
1.8 KiB
Makefile
56 lines
1.8 KiB
Makefile
#
|
|
# Makefile for the Linux TCP/IP (INET6) layer.
|
|
#
|
|
|
|
obj-$(CONFIG_IPV6) += ipv6.o
|
|
|
|
ipv6-objs := af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o \
|
|
addrlabel.o \
|
|
route.o ip6_fib.o ipv6_sockglue.o ndisc.o udp.o udplite.o \
|
|
raw.o icmp.o mcast.o reassembly.o tcp_ipv6.o ping.o \
|
|
exthdrs.o datagram.o ip6_flowlabel.o inet6_connection_sock.o \
|
|
udp_offload.o
|
|
|
|
ipv6-offload := ip6_offload.o tcpv6_offload.o exthdrs_offload.o
|
|
|
|
ipv6-$(CONFIG_SYSCTL) = sysctl_net_ipv6.o
|
|
ipv6-$(CONFIG_IPV6_MROUTE) += ip6mr.o
|
|
|
|
ipv6-$(CONFIG_XFRM) += xfrm6_policy.o xfrm6_state.o xfrm6_input.o \
|
|
xfrm6_output.o xfrm6_protocol.o
|
|
ipv6-$(CONFIG_NETFILTER) += netfilter.o
|
|
ipv6-$(CONFIG_IPV6_MULTIPLE_TABLES) += fib6_rules.o
|
|
ipv6-$(CONFIG_PROC_FS) += proc.o
|
|
ipv6-$(CONFIG_SYN_COOKIES) += syncookies.o
|
|
|
|
ipv6-objs += $(ipv6-y)
|
|
|
|
obj-$(CONFIG_INET6_AH) += ah6.o
|
|
obj-$(CONFIG_INET6_ESP) += esp6.o
|
|
obj-$(CONFIG_INET6_IPCOMP) += ipcomp6.o
|
|
obj-$(CONFIG_INET6_XFRM_TUNNEL) += xfrm6_tunnel.o
|
|
obj-$(CONFIG_INET6_TUNNEL) += tunnel6.o
|
|
obj-$(CONFIG_INET6_XFRM_MODE_TRANSPORT) += xfrm6_mode_transport.o
|
|
obj-$(CONFIG_INET6_XFRM_MODE_TUNNEL) += xfrm6_mode_tunnel.o
|
|
obj-$(CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION) += xfrm6_mode_ro.o
|
|
obj-$(CONFIG_INET6_XFRM_MODE_BEET) += xfrm6_mode_beet.o
|
|
obj-$(CONFIG_IPV6_MIP6) += mip6.o
|
|
obj-$(CONFIG_IPV6_ILA) += ila/
|
|
obj-$(CONFIG_NETFILTER) += netfilter/
|
|
|
|
obj-$(CONFIG_IPV6_VTI) += ip6_vti.o
|
|
obj-$(CONFIG_IPV6_SIT) += sit.o
|
|
obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o
|
|
obj-$(CONFIG_IPV6_GRE) += ip6_gre.o
|
|
obj-$(CONFIG_NET_FOU_IPV6_TUNNELS) += fou6.o
|
|
|
|
obj-y += addrconf_core.o exthdrs_core.o ip6_checksum.o ip6_icmp.o
|
|
obj-$(CONFIG_INET) += output_core.o protocol.o $(ipv6-offload)
|
|
|
|
obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o
|
|
|
|
ifneq ($(CONFIG_IPV6),)
|
|
obj-$(CONFIG_NET_UDP_TUNNEL) += ip6_udp_tunnel.o
|
|
obj-y += mcast_snoop.o
|
|
endif
|