diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-10-18 04:29:25 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-10-18 04:29:25 (GMT) |
commit | 33b5ecb8f64706d1ed472dcb44162ab3a7345724 (patch) | |
tree | 065d9cc0592bc08db34a562ff8753279cf52509c /include/net/xfrm.h | |
parent | c4541b41c0e4b75b11125fed16db642fc03cb31c (diff) | |
download | linux-fsl-qoriq-33b5ecb8f64706d1ed472dcb44162ab3a7345724.tar.xz |
[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>
Diffstat (limited to 'include/net/xfrm.h')
-rw-r--r-- | include/net/xfrm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 680739f..d8974ca 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1058,7 +1058,7 @@ static inline int xfrm4_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi) extern int xfrm4_output(struct sk_buff *skb); extern int xfrm4_tunnel_register(struct xfrm_tunnel *handler, unsigned short family); extern int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler, unsigned short family); -extern int xfrm6_rcv_spi(struct sk_buff *skb, __be32 spi); +extern int xfrm6_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi); extern int xfrm6_rcv(struct sk_buff *skb); extern int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr, xfrm_address_t *saddr, u8 proto); |