From owner-svn-src-head@FreeBSD.ORG  Thu Dec 11 09:16:47 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8254B7C;
 Thu, 11 Dec 2014 09:16:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6DDF135C;
 Thu, 11 Dec 2014 09:16:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBB9Glk3022987;
 Thu, 11 Dec 2014 09:16:47 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBB9GlJ2022986;
 Thu, 11 Dec 2014 09:16:47 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201412110916.sBB9GlJ2022986@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Thu, 11 Dec 2014 09:16:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r275700 - head/sys/netinet6
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Dec 2014 09:16:47 -0000

Author: markj
Date: Thu Dec 11 09:16:45 2014
New Revision: 275700
URL: https://svnweb.freebsd.org/changeset/base/275700

Log:
  Revert r275695: nd6_dad_find() was already correct.
  
  Reported by:	ae, kib
  Pointy hat to:	markj

Modified:
  head/sys/netinet6/nd6_nbr.c

Modified: head/sys/netinet6/nd6_nbr.c
==============================================================================
--- head/sys/netinet6/nd6_nbr.c	Thu Dec 11 08:05:59 2014	(r275699)
+++ head/sys/netinet6/nd6_nbr.c	Thu Dec 11 09:16:45 2014	(r275700)
@@ -1210,12 +1210,11 @@ nd6_dad_find(struct ifaddr *ifa)
 	TAILQ_FOREACH(dp, &V_dadq, dad_list)
 		if (dp->dad_ifa == ifa) {
 			refcount_acquire(&dp->dad_refcnt);
-			DADQ_RUNLOCK();
-			return (dp);
+			break;
 		}
 	DADQ_RUNLOCK();
 
-	return (NULL);
+	return (dp);
 }
 
 static void