Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...

[sfrench/cifs-2.6.git] / include / net / inet6_connection_sock.h

diff --git a/include/net/inet6_connection_sock.h b/include/net/inet6_connection_sock.h
index b33b438bffcce362e8fc227768f6b3d74fc51b87..f13ddc2543b1fcb07a10aee710a7e43b0f894d17 100644 (file)
--- a/include/net/inet6_connection_sock.h
+++ b/include/net/inet6_connection_sock.h
@@ -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);