diff options
-rw-r--r-- | include/net/inet_connection_sock.h | 2 | ||||
-rw-r--r-- | net/ipv4/inet_connection_sock.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h index 8122bcc83c1d..0bcf9f237e1f 100644 --- a/include/net/inet_connection_sock.h +++ b/include/net/inet_connection_sock.h | |||
@@ -238,7 +238,7 @@ extern struct sock *inet_csk_accept(struct sock *sk, int flags, int *err); | |||
238 | 238 | ||
239 | extern struct request_sock *inet_csk_search_req(const struct sock *sk, | 239 | extern 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 __be16 rport, |
242 | const __be32 raddr, | 242 | const __be32 raddr, |
243 | const __be32 laddr); | 243 | const __be32 laddr); |
244 | extern int inet_csk_bind_conflict(const struct sock *sk, | 244 | extern int inet_csk_bind_conflict(const struct sock *sk, |
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index b9f4b7d5726b..274b0b846c25 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 | ||
343 | EXPORT_SYMBOL_GPL(inet_csk_route_req); | 343 | EXPORT_SYMBOL_GPL(inet_csk_route_req); |
344 | 344 | ||
345 | static inline u32 inet_synq_hash(const __be32 raddr, const u16 rport, | 345 | static inline u32 inet_synq_hash(const __be32 raddr, const __be16 rport, |
346 | const u32 rnd, const u16 synq_hsize) | 346 | const u32 rnd, const u16 synq_hsize) |
347 | { | 347 | { |
348 | return jhash_2words((__force u32)raddr, (u32)rport, rnd) & (synq_hsize - 1); | 348 | return jhash_2words((__force u32)raddr, (__force 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,7 +356,7 @@ static inline u32 inet_synq_hash(const __be32 raddr, const u16 rport, | |||
356 | 356 | ||
357 | struct request_sock *inet_csk_search_req(const struct sock *sk, | 357 | struct 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 __be32 raddr, | 359 | const __be16 rport, const __be32 raddr, |
360 | const __be32 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); |