Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

[XFRM]: xfrm_spi_hash() annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Al Viro 19 years ago
parent
4324a17430
commit
8122adf06e
2 changed files with 3 additions and 3 deletions
Unified View Show Diff Stats
  1. 2 2
      net/xfrm/xfrm_hash.h
  2. 1 1
      net/xfrm/xfrm_state.c

+ 2 - 2
net/xfrm/xfrm_hash.h
View File 

@@ -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);

+ 1 - 1
net/xfrm/xfrm_state.c
View File 

@@ -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);
 
 }
 
 }