aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/xfrm6_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/ipv6/xfrm6_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/ipv6/xfrm6_state.c')
-rw-r--r--net/ipv6/xfrm6_state.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c
index 90fef0a4726f..bb09e85a336d 100644
--- a/net/ipv6/xfrm6_state.c
+++ b/net/ipv6/xfrm6_state.c
@@ -14,6 +14,7 @@
14#include <net/xfrm.h> 14#include <net/xfrm.h>
15#include <linux/pfkeyv2.h> 15#include <linux/pfkeyv2.h>
16#include <linux/ipsec.h> 16#include <linux/ipsec.h>
17#include <linux/netfilter_ipv6.h>
17#include <net/dsfield.h> 18#include <net/dsfield.h>
18#include <net/ipv6.h> 19#include <net/ipv6.h>
19#include <net/addrconf.h> 20#include <net/addrconf.h>
@@ -189,6 +190,7 @@ static struct xfrm_state_afinfo xfrm6_state_afinfo = {
189 .family = AF_INET6, 190 .family = AF_INET6,
190 .proto = IPPROTO_IPV6, 191 .proto = IPPROTO_IPV6,
191 .eth_proto = htons(ETH_P_IPV6), 192 .eth_proto = htons(ETH_P_IPV6),
193 .nf_post_routing = NF_IP6_POST_ROUTING,
192 .owner = THIS_MODULE, 194 .owner = THIS_MODULE,
193 .init_tempsel = __xfrm6_init_tempsel, 195 .init_tempsel = __xfrm6_init_tempsel,
194 .tmpl_sort = __xfrm6_tmpl_sort, 196 .tmpl_sort = __xfrm6_tmpl_sort,