tree 065d9cc0592bc08db34a562ff8753279cf52509c
parent c4541b41c0e4b75b11125fed16db642fc03cb31c
author Herbert Xu <herbert@gondor.apana.org.au> 1192681765 -0700
committer David S. Miller <davem@davemloft.net> 1192681765 -0700

[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>