diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-08 03:25:41 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:21:22 -0500 |
commit | fede70b9862635ab1bed84ab3d765e9069616b02 (patch) | |
tree | e04ee863fee693a8ea7678bd9cdbe9b0e664d2e2 /net/ipv6 | |
parent | 90bcaf7b4a33bb9b100cc06869f0c033a870d4a0 (diff) |
[IPV6]: annotate inet6_csk_search_req()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/inet6_connection_sock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c index 827f41d1478b..e48fb4c53c4f 100644 --- a/net/ipv6/inet6_connection_sock.c +++ b/net/ipv6/inet6_connection_sock.c | |||
@@ -52,7 +52,7 @@ EXPORT_SYMBOL_GPL(inet6_csk_bind_conflict); | |||
52 | /* | 52 | /* |
53 | * request_sock (formerly open request) hash tables. | 53 | * request_sock (formerly open request) hash tables. |
54 | */ | 54 | */ |
55 | static u32 inet6_synq_hash(const struct in6_addr *raddr, const u16 rport, | 55 | static u32 inet6_synq_hash(const struct in6_addr *raddr, const __be16 rport, |
56 | const u32 rnd, const u16 synq_hsize) | 56 | const u32 rnd, const u16 synq_hsize) |
57 | { | 57 | { |
58 | u32 a = raddr->s6_addr32[0]; | 58 | u32 a = raddr->s6_addr32[0]; |
@@ -65,7 +65,7 @@ static u32 inet6_synq_hash(const struct in6_addr *raddr, const u16 rport, | |||
65 | __jhash_mix(a, b, c); | 65 | __jhash_mix(a, b, c); |
66 | 66 | ||
67 | a += raddr->s6_addr32[3]; | 67 | a += raddr->s6_addr32[3]; |
68 | b += (u32)rport; | 68 | b += (__force u32)rport; |
69 | __jhash_mix(a, b, c); | 69 | __jhash_mix(a, b, c); |
70 | 70 | ||
71 | return c & (synq_hsize - 1); | 71 | return c & (synq_hsize - 1); |
@@ -73,7 +73,7 @@ static u32 inet6_synq_hash(const struct in6_addr *raddr, const u16 rport, | |||
73 | 73 | ||
74 | struct request_sock *inet6_csk_search_req(const struct sock *sk, | 74 | struct request_sock *inet6_csk_search_req(const struct sock *sk, |
75 | struct request_sock ***prevp, | 75 | struct request_sock ***prevp, |
76 | const __u16 rport, | 76 | const __be16 rport, |
77 | const struct in6_addr *raddr, | 77 | const struct in6_addr *raddr, |
78 | const struct in6_addr *laddr, | 78 | const struct in6_addr *laddr, |
79 | const int iif) | 79 | const int iif) |