]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c4541b4) | patch
[IPSEC]: Get nexthdr from caller in xfrm6_rcv_spi
authorHerbert Xu <herbert@gondor.apana.org.au>
Thu, 18 Oct 2007 04:29:25 +0000 (21:29 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 18 Oct 2007 04:29:25 +0000 (21:29 -0700)
commit33b5ecb8f64706d1ed472dcb44162ab3a7345724
tree065d9cc0592bc08db34a562ff8753279cf52509ctree | snapshot
parentc4541b41c0e4b75b11125fed16db642fc03cb31ccommit | diff
[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>
include/net/xfrm.h diff | blob | history
net/ipv6/xfrm6_input.c diff | blob | history
net/ipv6/xfrm6_tunnel.c diff | blob | history
Linux 2.6 source tree