Commit 8122adf0 authored by Al Viro's avatar Al Viro Committed by David S. Miller

[XFRM]: xfrm_spi_hash() annotations

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4324a174
...@@ -58,10 +58,10 @@ static inline unsigned __xfrm_src_hash(xfrm_address_t *saddr, ...@@ -58,10 +58,10 @@ static inline unsigned __xfrm_src_hash(xfrm_address_t *saddr,
} }
static inline unsigned int 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 hmask)
{ {
unsigned int h = spi ^ proto; unsigned int h = (__force u32)spi ^ proto;
switch (family) { switch (family) {
case AF_INET: case AF_INET:
h ^= __xfrm4_addr_hash(daddr); h ^= __xfrm4_addr_hash(daddr);
......
...@@ -70,7 +70,7 @@ static inline unsigned int xfrm_src_hash(xfrm_address_t *addr, ...@@ -70,7 +70,7 @@ static inline unsigned int xfrm_src_hash(xfrm_address_t *addr,
} }
static inline unsigned int 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); return __xfrm_spi_hash(daddr, spi, proto, family, xfrm_state_hmask);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment