From 0ba887c4653ec4bc4fd4188366c5eb8f8b4dac4c Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 25 Apr 2010 15:09:42 -0700
Subject: [PATCH] --- yaml --- r: 190253 b: refs/heads/master c:
 6443bb1fc2050ca2b6585a3fa77f7833b55329ed h: refs/heads/master i:   190251:
 45b8bcd628bf5476fb176a16f69df19fadcdf493 v: v3

---
 [refs]                                 | 2 +-
 trunk/net/ipv6/inet6_connection_sock.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 11782fbc080c..ba8cd37aea46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 401da6aea31ef69c2fcd260382adabdcf7ce820a
+refs/heads/master: 6443bb1fc2050ca2b6585a3fa77f7833b55329ed
diff --git a/trunk/net/ipv6/inet6_connection_sock.c b/trunk/net/ipv6/inet6_connection_sock.c
index b4b7d40a9c95..3a4d92b5a83e 100644
--- a/trunk/net/ipv6/inet6_connection_sock.c
+++ b/trunk/net/ipv6/inet6_connection_sock.c
@@ -48,7 +48,7 @@ int inet6_csk_bind_conflict(const struct sock *sk,
 			     ipv6_rcv_saddr_equal(sk, sk2))
 				break;
 			else if (sk->sk_reuse && sk2->sk_reuse &&
-				!ipv6_addr_any(inet6_rcv_saddr(sk2)) &&
+				!ipv6_addr_any(inet6_rcv_saddr(sk)) &&
 				ipv6_rcv_saddr_equal(sk, sk2))
 				break;
 		}