diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-12-04 01:54:12 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:55:49 -0500 |
commit | 2fcb45b6b87914f072314e5b5d9c196f45984683 (patch) | |
tree | e5a6cc4101a8b2693799fde9f47abaf480ae2dfc /include/net/xfrm.h | |
parent | bbca17680f82b1ba3122d41e8bc675aebf6d1cf2 (diff) |
[IPSEC]: Use the correct family for input state lookup
When merging the input paths of IPsec I accidentally left a hard-coded
AF_INET for the state lookup call. This broke IPv6 obviously. This
patch fixes by getting the input callers to specify the family through
skb->cb.
Credit goes to Kazunori Miyazawa for diagnosing this and providing an
initial patch.
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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index ecc02e9bde32..182f10b29d88 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
@@ -534,6 +534,7 @@ struct xfrm_spi_skb_cb { | |||
534 | } header; | 534 | } header; |
535 | 535 | ||
536 | unsigned int daddroff; | 536 | unsigned int daddroff; |
537 | unsigned int family; | ||
537 | }; | 538 | }; |
538 | 539 | ||
539 | #define XFRM_SPI_SKB_CB(__skb) ((struct xfrm_spi_skb_cb *)&((__skb)->cb[0])) | 540 | #define XFRM_SPI_SKB_CB(__skb) ((struct xfrm_spi_skb_cb *)&((__skb)->cb[0])) |