]> err.no Git - linux-2.6/commit
[IPSEC]: Fix transport-mode async resume on intput without netfilter
authorHerbert Xu <herbert@gondor.apana.org.au>
Mon, 31 Dec 2007 05:10:14 +0000 (21:10 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Jan 2008 23:00:10 +0000 (15:00 -0800)
commit0883ae0e5599656b5f3b0e9ce474e01dee7dfee4
treece21b9b78418aca9caf5cbc709de523c953a2db2
parentfcb8c156c8277ee9d71c8c81587d494c9c5240b3
[IPSEC]: Fix transport-mode async resume on intput without netfilter

When netfilter is off the transport-mode async resumption doesn't work
because we don't push back the IP header.  This patch fixes that by
moving most of the code outside of ifdef NETFILTER since the only part
that's not common is the short-circuit in the protocol handler.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/xfrm4_input.c
net/ipv6/xfrm6_input.c