diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-08 03:20:21 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:21:11 -0500 |
commit | 8c689a6eae2d83970e4f34753d513e96fb97a025 (patch) | |
tree | 50c67089a5a46dbde93fdcb6040227fb599d5110 /net/ipv6/xfrm6_tunnel.c | |
parent | d2ecd9ccd0694278a8c1fa179d1d058ee66e2297 (diff) |
[XFRM]: misc annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/xfrm6_tunnel.c')
-rw-r--r-- | net/ipv6/xfrm6_tunnel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index 7931e4f898d4..f26d81b6342c 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c | |||
@@ -62,7 +62,7 @@ static unsigned inline xfrm6_tunnel_spi_hash_byaddr(xfrm_address_t *addr) | |||
62 | { | 62 | { |
63 | unsigned h; | 63 | unsigned h; |
64 | 64 | ||
65 | h = addr->a6[0] ^ addr->a6[1] ^ addr->a6[2] ^ addr->a6[3]; | 65 | h = (__force u32)(addr->a6[0] ^ addr->a6[1] ^ addr->a6[2] ^ addr->a6[3]); |
66 | h ^= h >> 16; | 66 | h ^= h >> 16; |
67 | h ^= h >> 8; | 67 | h ^= h >> 8; |
68 | h &= XFRM6_TUNNEL_SPI_BYADDR_HSIZE - 1; | 68 | h &= XFRM6_TUNNEL_SPI_BYADDR_HSIZE - 1; |
@@ -126,7 +126,7 @@ static struct xfrm6_tunnel_spi *__xfrm6_tunnel_spi_lookup(xfrm_address_t *saddr) | |||
126 | return NULL; | 126 | return NULL; |
127 | } | 127 | } |
128 | 128 | ||
129 | u32 xfrm6_tunnel_spi_lookup(xfrm_address_t *saddr) | 129 | __be32 xfrm6_tunnel_spi_lookup(xfrm_address_t *saddr) |
130 | { | 130 | { |
131 | struct xfrm6_tunnel_spi *x6spi; | 131 | struct xfrm6_tunnel_spi *x6spi; |
132 | u32 spi; | 132 | u32 spi; |
@@ -196,7 +196,7 @@ out: | |||
196 | return spi; | 196 | return spi; |
197 | } | 197 | } |
198 | 198 | ||
199 | u32 xfrm6_tunnel_alloc_spi(xfrm_address_t *saddr) | 199 | __be32 xfrm6_tunnel_alloc_spi(xfrm_address_t *saddr) |
200 | { | 200 | { |
201 | struct xfrm6_tunnel_spi *x6spi; | 201 | struct xfrm6_tunnel_spi *x6spi; |
202 | u32 spi; | 202 | u32 spi; |