From fd33502487c953a07fab1fd9826d09a4e9b51652 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Fri, 18 Jan 2008 03:27:12 -0800 Subject: [PATCH] --- yaml --- r: 75608 b: refs/heads/master c: b3652b2dc5ec6ccd946ae9136b30c6babb81305a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv6/inet6_hashtables.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1c3a2cdce665..62147e15bc49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 632041f306707df94110441f55b1458ebeb096db +refs/heads/master: b3652b2dc5ec6ccd946ae9136b30c6babb81305a diff --git a/trunk/net/ipv6/inet6_hashtables.c b/trunk/net/ipv6/inet6_hashtables.c index adc73adadfae..0765d8bd380f 100644 --- a/trunk/net/ipv6/inet6_hashtables.c +++ b/trunk/net/ipv6/inet6_hashtables.c @@ -193,7 +193,7 @@ static int __inet6_check_established(struct inet_timewait_death_row *death_row, sk2->sk_family == PF_INET6 && ipv6_addr_equal(&tw6->tw_v6_daddr, saddr) && ipv6_addr_equal(&tw6->tw_v6_rcv_saddr, daddr) && - sk2->sk_bound_dev_if == sk->sk_bound_dev_if) { + (!sk2->sk_bound_dev_if || sk2->sk_bound_dev_if == dif)) { if (twsk_unique(sk, sk2, twp)) goto unique; else