From owner-svn-src-all@FreeBSD.ORG  Fri Nov 11 14:42:05 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B5FC310657CC;
	Fri, 11 Nov 2011 14:42:05 +0000 (UTC)
	(envelope-from trociny@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A41D58FC0A;
	Fri, 11 Nov 2011 14:42:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pABEg5k6095065;
	Fri, 11 Nov 2011 14:42:05 GMT (envelope-from trociny@svn.freebsd.org)
Received: (from trociny@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pABEg5rm095063;
	Fri, 11 Nov 2011 14:42:05 GMT (envelope-from trociny@svn.freebsd.org)
Message-Id: <201111111442.pABEg5rm095063@svn.freebsd.org>
From: Mikolaj Golub <trociny@FreeBSD.org>
Date: Fri, 11 Nov 2011 14:42:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227450 - stable/9/sys/netinet6
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Nov 2011 14:42:05 -0000

Author: trociny
Date: Fri Nov 11 14:42:05 2011
New Revision: 227450
URL: http://svn.freebsd.org/changeset/base/227450

Log:
  MFC r227449:
  
  Fix false positive EADDRINUSE that could be returned by bind, due to
  the typo made in r227207.
  
  Reported by:	kib
  Tested by:	kib
  
  Approved by:	re (kib)

Modified:
  stable/9/sys/netinet6/in6_pcb.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/netinet6/in6_pcb.c
==============================================================================
--- stable/9/sys/netinet6/in6_pcb.c	Fri Nov 11 14:09:09 2011	(r227449)
+++ stable/9/sys/netinet6/in6_pcb.c	Fri Nov 11 14:42:05 2011	(r227450)
@@ -270,7 +270,7 @@ in6_pcbbind(register struct inpcb *inp, 
 				} else if (t && (reuseport == 0 ||
 				    (t->inp_flags2 & INP_REUSEPORT) == 0) &&
 				    (ntohl(t->inp_laddr.s_addr) != INADDR_ANY ||
-				    (t->inp_vflag & INP_IPV6PROTO) == 0))
+				    (t->inp_vflag & INP_IPV6PROTO) != 0))
 					return (EADDRINUSE);
 			}
 #endif