]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
[IPV6] HASHTABLES: Use appropriate seed for caluculating ehash index.
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Wed, 28 Mar 2007 20:04:44 +0000 (22:04 +0200)
committerAdrian Bunk <bunk@stusta.de>
Wed, 28 Mar 2007 20:04:44 +0000 (22:04 +0200)
Tetsuo Handa <handat@pm.nttdata.co.jp> told me that connect(2) with TCPv6
socket almost always took a few minutes to return when we did not have any
ports available in the range of net.ipv4.ip_local_port_range.

The reason was that we used incorrect seed for calculating index of
hash when we check established sockets in __inet6_check_established().

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
net/ipv6/inet6_hashtables.c

index bb8ffb8a14c5d17ff7e22c3d18d9ffb4ad9f058e..47e7951796d3dd088a9a0083d95f59b42de65358 100644 (file)
@@ -93,7 +93,7 @@ static int __inet6_check_established(struct inet_timewait_death_row *death_row,
        const struct in6_addr *saddr = &np->daddr;
        const int dif = sk->sk_bound_dev_if;
        const u32 ports = INET_COMBINED_PORTS(inet->dport, lport);
-       const unsigned int hash = inet6_ehashfn(daddr, inet->num, saddr,
+       const unsigned int hash = inet6_ehashfn(daddr, lport, saddr,
                                                inet->dport);
        struct inet_ehash_bucket *head = inet_ehash_bucket(hinfo, hash);
        struct sock *sk2;