From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 18 Oct 2007 04:29:25 +0000 (-0700)
Subject: [IPSEC]: Get nexthdr from caller in xfrm6_rcv_spi
X-Git-Tag: v2.6.24-rc1~294^2~18
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33b5ecb8f64706d1ed472dcb44162ab3a7345724;p=pandora-kernel.git

[IPSEC]: Get nexthdr from caller in xfrm6_rcv_spi

Currently xfrm6_rcv_spi gets the nexthdr value itself from the packet.
This means that we need to fix up the value in case we have a 4-on-6
tunnel.  Moving this logic into the caller simplifies things and allows
us to merge the code with IPv4.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed