[IPV6]: annotate inet6_csk_search_req()
authorAl Viro <viro@zeniv.linux.org.uk>
Wed, 8 Nov 2006 08:25:41 +0000 (00:25 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Sun, 3 Dec 2006 05:21:22 +0000 (21:21 -0800)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/inet6_connection_sock.h
net/ipv6/inet6_connection_sock.c

index b33b438bffcce362e8fc227768f6b3d74fc51b87..f13ddc2543b1fcb07a10aee710a7e43b0f894d17 100644 (file)
@@ -27,7 +27,7 @@ extern int inet6_csk_bind_conflict(const struct sock *sk,
 
 extern struct request_sock *inet6_csk_search_req(const struct sock *sk,
                                                 struct request_sock ***prevp,
-                                                const __u16 rport,
+                                                const __be16 rport,
                                                 const struct in6_addr *raddr,
                                                 const struct in6_addr *laddr,
                                                 const int iif);
index 827f41d1478b3076b146db5563d903760fb5c6bc..e48fb4c53c4f7397279194fe623b813a01afa7de 100644 (file)
@@ -52,7 +52,7 @@ EXPORT_SYMBOL_GPL(inet6_csk_bind_conflict);
 /*
  * request_sock (formerly open request) hash tables.
  */
-static u32 inet6_synq_hash(const struct in6_addr *raddr, const u16 rport,
+static u32 inet6_synq_hash(const struct in6_addr *raddr, const __be16 rport,
                           const u32 rnd, const u16 synq_hsize)
 {
        u32 a = raddr->s6_addr32[0];
@@ -65,7 +65,7 @@ static u32 inet6_synq_hash(const struct in6_addr *raddr, const u16 rport,
        __jhash_mix(a, b, c);
 
        a += raddr->s6_addr32[3];
-       b += (u32)rport;
+       b += (__force u32)rport;
        __jhash_mix(a, b, c);
 
        return c & (synq_hsize - 1);
@@ -73,7 +73,7 @@ static u32 inet6_synq_hash(const struct in6_addr *raddr, const u16 rport,
 
 struct request_sock *inet6_csk_search_req(const struct sock *sk,
                                          struct request_sock ***prevp,
-                                         const __u16 rport,
+                                         const __be16 rport,
                                          const struct in6_addr *raddr,
                                          const struct in6_addr *laddr,
                                          const int iif)