aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/xfrm4_state.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-11-14 00:43:11 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:53:48 -0500
commit862b82c6f960cc61274d370aa78ce1112f92a83e (patch)
tree51e252e1525dd7d02a695d428890a4c37fae2442 /net/ipv4/xfrm4_state.c
parentef76bc23ef2acf20c8f7f841a542d8ab74c827c6 (diff)
[IPSEC]: Merge most of the output path
As part of the work on asynchrnous cryptographic operations, we need to be able to resume from the spot where they occur. As such, it helps if we isolate them to one spot. This patch moves most of the remaining family-specific processing into the common output code. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/xfrm4_state.c')
-rw-r--r--net/ipv4/xfrm4_state.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c
index 85f04b7b237f..80292fbf221a 100644
--- a/net/ipv4/xfrm4_state.c
+++ b/net/ipv4/xfrm4_state.c
@@ -11,6 +11,7 @@
11#include <net/xfrm.h> 11#include <net/xfrm.h>
12#include <linux/pfkeyv2.h> 12#include <linux/pfkeyv2.h>
13#include <linux/ipsec.h> 13#include <linux/ipsec.h>
14#include <linux/netfilter_ipv4.h>
14 15
15static struct xfrm_state_afinfo xfrm4_state_afinfo; 16static struct xfrm_state_afinfo xfrm4_state_afinfo;
16 17
@@ -66,6 +67,7 @@ static struct xfrm_state_afinfo xfrm4_state_afinfo = {
66 .family = AF_INET, 67 .family = AF_INET,
67 .proto = IPPROTO_IPIP, 68 .proto = IPPROTO_IPIP,
68 .eth_proto = htons(ETH_P_IP), 69 .eth_proto = htons(ETH_P_IP),
70 .nf_post_routing = NF_IP_POST_ROUTING,
69 .owner = THIS_MODULE, 71 .owner = THIS_MODULE,
70 .init_flags = xfrm4_init_flags, 72 .init_flags = xfrm4_init_flags,
71 .init_tempsel = __xfrm4_init_tempsel, 73 .init_tempsel = __xfrm4_init_tempsel,