Attachment 291141 Details for Bug 248052 – potential upstream fix...

potential upstream fix...

x.diff (text/x-patch), 1.35 KB, created by David Miller on 2008-01-09 13:30:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Miller

Created: 2008-01-09 13:30:54 UTC

Size: 1.35 KB

patch

obsolete

>commit 6e1d9d04c4004361fb327abcbde74a20e8dca2ff
>Author: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
>Date:   Mon Feb 12 20:26:39 2007 -0800
>
>    [IPV6] HASHTABLES: Use appropriate seed for caluculating ehash index.
>    
>    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>
>
>diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
>index 30b16da..ae6b0e7 100644
>--- a/net/ipv6/inet6_hashtables.c
>+++ b/net/ipv6/inet6_hashtables.c
>@@ -172,7 +172,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 __portpair 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;

Actions: View

Attachments on bug 248052: 159092 | 159093 | 160039 | 291141 | 291195