d2acc3479c
Basically this patch moves the generic tunnel protocol stuff out of xfrm4_tunnel/xfrm6_tunnel and moves it into the new files of tunnel4.c and tunnel6 respectively. The reason for this is that the problem that Hugo uncovered is only the tip of the iceberg. The real problem is that when we removed the dependency of ipip on xfrm4_tunnel we didn't really consider the module case at all. For instance, as it is it's possible to build both ipip and xfrm4_tunnel as modules and if the latter is loaded then ipip simply won't load. After considering the alternatives I've decided that the best way out of this is to restore the dependency of ipip on the non-xfrm-specific part of xfrm4_tunnel. This is acceptable IMHO because the intention of the removal was really to be able to use ipip without the xfrm subsystem. This is still preserved by this patch. So now both ipip/xfrm4_tunnel depend on the new tunnel4.c which handles the arbitration between the two. The order of processing is determined by a simple integer which ensures that ipip gets processed before xfrm4_tunnel. The situation for ICMP handling is a little bit more complicated since we may not have enough information to determine who it's for. It's not a big deal at the moment since the xfrm ICMP handlers are basically no-ops. In future we can deal with this when we look at ICMP caching in general. The user-visible change to this is the removal of the TUNNEL Kconfig prompts. This makes sense because it can only be used through IPCOMP as it stands. The addition of the new modules shouldn't introduce any problems since module dependency will cause them to be loaded. Oh and I also turned some unnecessary pskb's in IPv6 related to this patch to skb's. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
30 lines
882 B
Makefile
30 lines
882 B
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 sit.o \
|
|
route.o ip6_fib.o ipv6_sockglue.o ndisc.o udp.o raw.o \
|
|
protocol.o icmp.o mcast.o reassembly.o tcp_ipv6.o \
|
|
exthdrs.o sysctl_net_ipv6.o datagram.o proc.o \
|
|
ip6_flowlabel.o ipv6_syms.o inet6_connection_sock.o
|
|
|
|
ipv6-$(CONFIG_XFRM) += xfrm6_policy.o xfrm6_state.o xfrm6_input.o \
|
|
xfrm6_output.o
|
|
ipv6-$(CONFIG_NETFILTER) += netfilter.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_NETFILTER) += netfilter/
|
|
|
|
obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o
|
|
|
|
obj-y += exthdrs_core.o
|
|
|
|
obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o
|