From owner-svn-src-head@FreeBSD.ORG  Tue Dec 16 02:30:43 2008
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6E832106564A;
	Tue, 16 Dec 2008 02:30:43 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5A4C48FC0C;
	Tue, 16 Dec 2008 02:30:43 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBG2UhE9023756;
	Tue, 16 Dec 2008 02:30:43 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBG2UgNg023754;
	Tue, 16 Dec 2008 02:30:42 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200812160230.mBG2UgNg023754@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 16 Dec 2008 02:30:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186158 - head/sys/netinet6
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Tue, 16 Dec 2008 02:30:43 -0000

Author: kmacy
Date: Tue Dec 16 02:30:42 2008
New Revision: 186158
URL: http://svn.freebsd.org/changeset/base/186158

Log:
  check return from lla_lookup against NULL not zero

Modified:
  head/sys/netinet6/in6.c
  head/sys/netinet6/in6_src.c

Modified: head/sys/netinet6/in6.c
==============================================================================
--- head/sys/netinet6/in6.c	Tue Dec 16 02:06:26 2008	(r186157)
+++ head/sys/netinet6/in6.c	Tue Dec 16 02:30:42 2008	(r186158)
@@ -1593,7 +1593,7 @@ in6_ifinit(struct ifnet *ifp, struct in6
 		ln = lla_lookup(LLTABLE6(ifp), (LLE_CREATE | LLE_IFADDR | LLE_EXCLUSIVE),
 		    (struct sockaddr *)&ia->ia_addr);
 		IF_AFDATA_UNLOCK(ifp);
-		if (ln) {
+		if (ln != NULL) {
 			ln->la_expire = 0;  /* for IPv6 this means permanent */
 			ln->ln_state = ND6_LLINFO_REACHABLE;
 			LLE_WUNLOCK(ln);

Modified: head/sys/netinet6/in6_src.c
==============================================================================
--- head/sys/netinet6/in6_src.c	Tue Dec 16 02:06:26 2008	(r186157)
+++ head/sys/netinet6/in6_src.c	Tue Dec 16 02:30:42 2008	(r186158)
@@ -574,7 +574,7 @@ selectroute(struct sockaddr_in6 *dstsock
 		IF_AFDATA_LOCK(ifp);
 		la = lla_lookup(LLTABLE6(ifp), 0, (struct sockaddr *)&sin6_next->sin6_addr);
 		IF_AFDATA_UNLOCK(ifp);
-		if (la) 
+		if (la != NULL) 
 			LLE_RUNLOCK(la);
 		else {
 			error = EHOSTUNREACH;