aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-02-05 06:14:44 -0500
committerDavid S. Miller <davem@davemloft.net>2008-02-05 06:14:44 -0500
commit5d8c0aa9433b09387d9021358baef7939f9b32c4 (patch)
tree839a532abef00a33e3b2357340ad52cec92bce5f /net
parent2bfc79de2b6482955f0e352da7e53787dd8167c0 (diff)
[INET]: Fix accidentally broken inet(6)_hash_connect's port offset calculations.
The port offset calculations depend on the protocol family, but, as Adrian noticed, I broke this logic with the commit 5ee31fc1ecdcbc234c8c56dcacef87c8e09909d8 [INET]: Consolidate inet(6)_hash_connect. Return this logic back, by passing the port offset directly into the consolidated function. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Noticed-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/inet_hashtables.c6
-rw-r--r--net/ipv6/inet6_hashtables.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 90f422c9447b..9cac6c034abd 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -398,7 +398,7 @@ out:
398EXPORT_SYMBOL_GPL(inet_unhash); 398EXPORT_SYMBOL_GPL(inet_unhash);
399 399
400int __inet_hash_connect(struct inet_timewait_death_row *death_row, 400int __inet_hash_connect(struct inet_timewait_death_row *death_row,
401 struct sock *sk, 401 struct sock *sk, u32 port_offset,
402 int (*check_established)(struct inet_timewait_death_row *, 402 int (*check_established)(struct inet_timewait_death_row *,
403 struct sock *, __u16, struct inet_timewait_sock **), 403 struct sock *, __u16, struct inet_timewait_sock **),
404 void (*hash)(struct sock *sk)) 404 void (*hash)(struct sock *sk))
@@ -413,7 +413,7 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row,
413 if (!snum) { 413 if (!snum) {
414 int i, remaining, low, high, port; 414 int i, remaining, low, high, port;
415 static u32 hint; 415 static u32 hint;
416 u32 offset = hint + inet_sk_port_offset(sk); 416 u32 offset = hint + port_offset;
417 struct hlist_node *node; 417 struct hlist_node *node;
418 struct inet_timewait_sock *tw = NULL; 418 struct inet_timewait_sock *tw = NULL;
419 419
@@ -502,7 +502,7 @@ EXPORT_SYMBOL_GPL(__inet_hash_connect);
502int inet_hash_connect(struct inet_timewait_death_row *death_row, 502int inet_hash_connect(struct inet_timewait_death_row *death_row,
503 struct sock *sk) 503 struct sock *sk)
504{ 504{
505 return __inet_hash_connect(death_row, sk, 505 return __inet_hash_connect(death_row, sk, inet_sk_port_offset(sk),
506 __inet_check_established, __inet_hash_nolisten); 506 __inet_check_established, __inet_hash_nolisten);
507} 507}
508 508
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
index 43f3993e1f30..99fd25f7f005 100644
--- a/net/ipv6/inet6_hashtables.c
+++ b/net/ipv6/inet6_hashtables.c
@@ -236,7 +236,7 @@ static inline u32 inet6_sk_port_offset(const struct sock *sk)
236int inet6_hash_connect(struct inet_timewait_death_row *death_row, 236int inet6_hash_connect(struct inet_timewait_death_row *death_row,
237 struct sock *sk) 237 struct sock *sk)
238{ 238{
239 return __inet_hash_connect(death_row, sk, 239 return __inet_hash_connect(death_row, sk, inet6_sk_port_offset(sk),
240 __inet6_check_established, __inet6_hash); 240 __inet6_check_established, __inet6_hash);
241} 241}
242 242