aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/xfrm.h
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-12-03 22:54:12 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 14:55:49 -0800
commit2fcb45b6b87914f072314e5b5d9c196f45984683 (patch)
treee5a6cc4101a8b2693799fde9f47abaf480ae2dfc /include/net/xfrm.h
parentbbca17680f82b1ba3122d41e8bc675aebf6d1cf2 (diff)
downloadkernel_samsung_aries-2fcb45b6b87914f072314e5b5d9c196f45984683.zip
kernel_samsung_aries-2fcb45b6b87914f072314e5b5d9c196f45984683.tar.gz
kernel_samsung_aries-2fcb45b6b87914f072314e5b5d9c196f45984683.tar.bz2
[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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index ecc02e9..182f10b 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -534,6 +534,7 @@ struct xfrm_spi_skb_cb {
} header;
unsigned int daddroff;
+ unsigned int family;
};
#define XFRM_SPI_SKB_CB(__skb) ((struct xfrm_spi_skb_cb *)&((__skb)->cb[0]))