Herbert Xu
d2acc3479c
[INET]: Introduce tunnel4/tunnel6 ...
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>
2006-03-28 17:02:46 -08:00
[Bluetooth] Reduce L2CAP MTU for RFCOMM connections
2006-02-13 11:39:57 +01:00
[IRDA]: Ratelimit messages.
2006-02-13 15:34:11 -08:00
[PATCH] Notifier chain update: API changes
2006-03-27 08:44:50 -08:00
[NET]: {get|set}sockopt compatibility layer
2006-03-20 22:45:21 -08:00
[NETFILTER]: futher {ip,ip6,arp}_tables unification
2006-03-22 13:56:56 -08:00
[TIPC] More updates of file headers
2006-01-12 14:06:39 -08:00
[PKT_SCHED]: Convert tc action functions to single skb pointers
2006-01-09 14:16:08 -08:00
[NET]: sem2mutex part 2
2006-03-20 22:35:41 -08:00
[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h
2006-01-03 13:11:21 -08:00
[AX.25]: Fix potencial memory hole.
2006-03-19 13:20:06 -08:00
[NET]: socket timestamp 32 bit handler for 64 bit kernel
2006-03-21 23:59:39 -08:00
[DECnet]: Endian annotation and fixes for DECnet.
2006-03-20 22:42:39 -08:00
[DECnet]: Endian annotation and fixes for DECnet.
2006-03-20 22:42:39 -08:00
[DECnet]: Endian annotation and fixes for DECnet.
2006-03-20 22:42:39 -08:00
[DECnet]: Endian annotation and fixes for DECnet.
2006-03-20 22:42:39 -08:00
[DECnet]: Endian annotation and fixes for DECnet.
2006-03-20 22:42:39 -08:00
[DECnet]: Endian annotation and fixes for DECnet.
2006-03-20 22:42:39 -08:00
[XFRM]: Netfilter IPsec output hooks
2006-01-07 12:57:28 -08:00
[DECnet]: Endian annotation and fixes for DECnet.
2006-03-20 22:42:39 -08:00
[PATCH] genetlink: don't touch module ref count
2006-01-13 13:06:40 -08:00
[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h
2006-01-03 13:11:21 -08:00
[PATCH] ieee80211: common wx auth code
2006-01-30 20:35:35 -05:00
[PATCH] ieee80211: Add TKIP crypt->build_iv
2006-01-27 17:08:07 -05:00
[PATCH] softmac: add copyright and license headers
2006-03-22 22:16:56 -05:00
[PATCH] softmac: add copyright and license headers
2006-03-22 22:16:56 -05:00
[IPV6]: ADDRCONF: Use our standard algorithm for randomized ifid.
2006-03-20 16:54:09 -08:00
[IPV6]: Generalise some functions
2006-01-03 13:10:46 -08:00
[IPV6]: Introduce inet6_timewait_sock
2006-01-03 13:10:47 -08:00
[NET]: move struct proto_ops to const
2006-01-03 13:11:15 -08:00
[ICSK] compat: Introduce inet_csk_compat_[gs]etsockopt
2006-03-20 22:46:16 -08:00
[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h
2006-01-03 13:11:21 -08:00
[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h
2006-01-03 13:11:21 -08:00
[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h
2006-01-03 13:11:21 -08:00
[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h
2006-01-03 13:11:21 -08:00
[IPV4]: Safer reassembly
2006-01-03 13:10:31 -08:00
[NET]: {get|set}sockopt compatibility layer
2006-03-20 22:45:21 -08:00
[IPV6]: ROUTE: Add experimental support for Route Information Option in RA (RFC4191).
2006-03-20 17:06:24 -08:00
[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h
2006-01-03 13:11:21 -08:00
[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h
2006-01-03 13:11:21 -08:00
[NET]: {get|set}sockopt compatibility layer
2006-03-20 22:45:21 -08:00
[PATCH] WE-20 for kernel 2.6.16
2006-03-23 07:12:57 -05:00
[LLC]: llc_mac_hdr_init const arguments
2006-03-20 22:59:36 -08:00
[LLC]: Fix typo
2005-11-14 21:58:18 -08:00
[IPV6]: ROUTE: Add experimental support for Route Information Option in RA (RFC4191).
2006-03-20 17:06:24 -08:00
[NET]: Move destructor from neigh->ops to neigh_params
2006-03-20 22:25:41 -08:00
[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h
2006-01-03 13:11:21 -08:00
[PKT_SCHED]: Use USEC_PER_SEC
2006-01-09 14:16:05 -08:00
[IPV6]: Move nextheader offset to the IP6CB
2006-01-07 12:57:29 -08:00
[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h
2006-01-03 13:11:21 -08:00
[NET]: drop duplicate assignment in request_sock
2006-03-26 17:39:55 -08:00
[IPV4]: Aggregate route entries with different TOS values
2006-03-25 01:38:55 -08:00
[AF_UNIX]: scm: better initialization
2006-03-20 21:31:51 -08:00
[NET]: deinline 200+ byte inlines in sock.h
2006-03-28 17:02:45 -08:00
[NET]: {get|set}sockopt compatibility layer
2006-03-20 22:45:21 -08:00
[TCP]: Move the TCPF_ enum to tcp_states.h
2006-01-03 13:10:57 -08:00
[TWSK]: Introduce struct timewait_sock_ops
2006-01-03 13:10:54 -08:00
[ICSK]: Rename struct tcp_func to struct inet_connection_sock_af_ops
2006-01-03 13:10:38 -08:00
[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h
2006-01-03 13:11:21 -08:00
[X25]: allow ITU-T DTE facilities for x25
2006-03-22 00:01:31 -08:00
[INET]: Introduce tunnel4/tunnel6
2006-03-28 17:02:46 -08:00
d2acc3479c