---

yaml --- r: 368107 b: refs/heads/master c: dd9f319 h: refs/heads/master i: 368105: 2b2aeeb 368103: da8d22f v: v3
git-mirror · Mar 6, 2013 · 0c96e0e · 0c96e0e
1 parent 3317361
commit 0c96e0e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fae4f3cf49ac9d91b83c705809d71fdeb0dc9284
+refs/heads/master: dd9f319d94c99b96fc9b34ccde7389a91059fe31
diff --git a/trunk/net/ipv6/inet6_connection_sock.c b/trunk/net/ipv6/inet6_connection_sock.c
@@ -54,6 +54,10 @@ int inet6_csk_bind_conflict(const struct sock *sk,
 				if (ipv6_rcv_saddr_equal(sk, sk2))
 					break;
 			}
+			if (!relax && reuse && sk2->sk_reuse &&
+			    sk2->sk_state != TCP_LISTEN &&
+			    ipv6_rcv_saddr_equal(sk, sk2))
+				break;
 		}
 	}