diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2006-09-27 18:49:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-28 18:02:44 -0700 |
| commit | 8122adf06e6f93ae608cf8227e878cc44f4a8fd1 (patch) | |
| tree | b83ddb821f85c015e5414817c3d6a1f42a35630c /net | |
| parent | 4324a174304d1d826582be5422a976e09d2b1e63 (diff) | |
| download | kernel-common-8122adf06e6f93ae608cf8227e878cc44f4a8fd1.tar.gz kernel-common-8122adf06e6f93ae608cf8227e878cc44f4a8fd1.tar.bz2 kernel-common-8122adf06e6f93ae608cf8227e878cc44f4a8fd1.zip | |
[XFRM]: xfrm_spi_hash() annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/xfrm/xfrm_hash.h | 4 | ||||
| -rw-r--r-- | net/xfrm/xfrm_state.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/xfrm/xfrm_hash.h b/net/xfrm/xfrm_hash.h index d3abb0b7dc62..6ac4e4f033ac 100644 --- a/net/xfrm/xfrm_hash.h +++ b/net/xfrm/xfrm_hash.h @@ -58,10 +58,10 @@ static inline unsigned __xfrm_src_hash(xfrm_address_t *saddr, } static inline unsigned int -__xfrm_spi_hash(xfrm_address_t *daddr, u32 spi, u8 proto, unsigned short family, +__xfrm_spi_hash(xfrm_address_t *daddr, __be32 spi, u8 proto, unsigned short family, unsigned int hmask) { - unsigned int h = spi ^ proto; + unsigned int h = (__force u32)spi ^ proto; switch (family) { case AF_INET: h ^= __xfrm4_addr_hash(daddr); diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 25657f57fbb0..fafe1ed5f56b 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -70,7 +70,7 @@ static inline unsigned int xfrm_src_hash(xfrm_address_t *addr, } static inline unsigned int -xfrm_spi_hash(xfrm_address_t *daddr, u32 spi, u8 proto, unsigned short family) +xfrm_spi_hash(xfrm_address_t *daddr, __be32 spi, u8 proto, unsigned short family) { return __xfrm_spi_hash(daddr, spi, proto, family, xfrm_state_hmask); } |