lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[XFRM]: Simplify xfrm_spi_hash

Browse Source 
It can use __xfrm{4,6}_addr_hash().

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2006-08-24 03:26:44 -07:00
parent a624c108e5
commit 2575b65434
1 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
net/xfrm/xfrm_state.c
View File

@@ -107,35 +107,20 @@ static inline unsigned xfrm_src_hash(xfrm_address_t *addr, unsigned short family
return __xfrm_src_hash(addr, family, xfrm_state_hmask); return __xfrm_src_hash(addr, family, xfrm_state_hmask);
} }
static inline unsigned int __xfrm4_spi_hash(xfrm_address_t *addr, u32 spi, u8 proto, static inline unsigned int
unsigned int hmask) __xfrm_spi_hash(xfrm_address_t *addr, u32 spi, u8 proto, unsigned short family,
{ unsigned int hmask)
unsigned int h;
h = ntohl(addr->a4^spi^proto);
h = (h ^ (h>>10) ^ (h>>20)) & hmask;
return h;
}
static inline unsigned int __xfrm6_spi_hash(xfrm_address_t *addr, u32 spi, u8 proto,
unsigned int hmask)
{
unsigned int h;
h = ntohl(addr->a6[2]^addr->a6[3]^spi^proto);
h = (h ^ (h>>10) ^ (h>>20)) & hmask;
return h;
}
static inline
unsigned __xfrm_spi_hash(xfrm_address_t *addr, u32 spi, u8 proto, unsigned short family,
unsigned int hmask)
{ {
unsigned int h = spi ^ proto;
switch (family) { switch (family) {
case AF_INET: case AF_INET:
return __xfrm4_spi_hash(addr, spi, proto, hmask); h ^= __xfrm4_addr_hash(addr);
break;
case AF_INET6: case AF_INET6:
return __xfrm6_spi_hash(addr, spi, proto, hmask); h ^= __xfrm6_addr_hash(addr);
break;
} }
return 0; /*XXX*/ return (h ^ (h >> 10) ^ (h >> 20)) & hmask;
} }
static inline unsigned int static inline unsigned int