diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-09-27 21:49:35 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-28 21:02:44 -0400 |
commit | 8122adf06e6f93ae608cf8227e878cc44f4a8fd1 (patch) | |
tree | b83ddb821f85c015e5414817c3d6a1f42a35630c /net/xfrm/xfrm_hash.h | |
parent | 4324a174304d1d826582be5422a976e09d2b1e63 (diff) |
[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/xfrm/xfrm_hash.h')
-rw-r--r-- | net/xfrm/xfrm_hash.h | 4 |
1 files changed, 2 insertions, 2 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, | |||
58 | } | 58 | } |
59 | 59 | ||
60 | static inline unsigned int | 60 | static inline unsigned int |
61 | __xfrm_spi_hash(xfrm_address_t *daddr, u32 spi, u8 proto, unsigned short family, | 61 | __xfrm_spi_hash(xfrm_address_t *daddr, __be32 spi, u8 proto, unsigned short family, |
62 | unsigned int hmask) | 62 | unsigned int hmask) |
63 | { | 63 | { |
64 | unsigned int h = spi ^ proto; | 64 | unsigned int h = (__force u32)spi ^ proto; |
65 | switch (family) { | 65 | switch (family) { |
66 | case AF_INET: | 66 | case AF_INET: |
67 | h ^= __xfrm4_addr_hash(daddr); | 67 | h ^= __xfrm4_addr_hash(daddr); |