aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-09-27 21:27:47 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-28 21:01:52 -0400
commit7f25afbbefb266520a237df0e9b59112704a7a42 (patch)
tree2a394c336c6cb4c4c331c9fe6ba90ec60ec25160
parentadaf345b537681c6ed3657941904d976fe72f342 (diff)
[IPV4]: inet_csk_search_req() (partial) annotations
raddr is net-endian Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/inet_connection_sock.h4
-rw-r--r--net/ipv4/inet_connection_sock.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index de4e83b6da4b..8122bcc83c1d 100644
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -239,8 +239,8 @@ extern struct sock *inet_csk_accept(struct sock *sk, int flags, int *err);
239extern struct request_sock *inet_csk_search_req(const struct sock *sk, 239extern struct request_sock *inet_csk_search_req(const struct sock *sk,
240 struct request_sock ***prevp, 240 struct request_sock ***prevp,
241 const __u16 rport, 241 const __u16 rport,
242 const __u32 raddr, 242 const __be32 raddr,
243 const __u32 laddr); 243 const __be32 laddr);
244extern int inet_csk_bind_conflict(const struct sock *sk, 244extern int inet_csk_bind_conflict(const struct sock *sk,
245 const struct inet_bind_bucket *tb); 245 const struct inet_bind_bucket *tb);
246extern int inet_csk_get_port(struct inet_hashinfo *hashinfo, 246extern int inet_csk_get_port(struct inet_hashinfo *hashinfo,
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 07204391d083..b9f4b7d5726b 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -342,10 +342,10 @@ struct dst_entry* inet_csk_route_req(struct sock *sk,
342 342
343EXPORT_SYMBOL_GPL(inet_csk_route_req); 343EXPORT_SYMBOL_GPL(inet_csk_route_req);
344 344
345static inline u32 inet_synq_hash(const u32 raddr, const u16 rport, 345static inline u32 inet_synq_hash(const __be32 raddr, const u16 rport,
346 const u32 rnd, const u16 synq_hsize) 346 const u32 rnd, const u16 synq_hsize)
347{ 347{
348 return jhash_2words(raddr, (u32)rport, rnd) & (synq_hsize - 1); 348 return jhash_2words((__force u32)raddr, (u32)rport, rnd) & (synq_hsize - 1);
349} 349}
350 350
351#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) 351#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
@@ -356,8 +356,8 @@ static inline u32 inet_synq_hash(const u32 raddr, const u16 rport,
356 356
357struct request_sock *inet_csk_search_req(const struct sock *sk, 357struct request_sock *inet_csk_search_req(const struct sock *sk,
358 struct request_sock ***prevp, 358 struct request_sock ***prevp,
359 const __u16 rport, const __u32 raddr, 359 const __u16 rport, const __be32 raddr,
360 const __u32 laddr) 360 const __be32 laddr)
361{ 361{
362 const struct inet_connection_sock *icsk = inet_csk(sk); 362 const struct inet_connection_sock *icsk = inet_csk(sk);
363 struct listen_sock *lopt = icsk->icsk_accept_queue.listen_opt; 363 struct listen_sock *lopt = icsk->icsk_accept_queue.listen_opt;