From owner-svn-src-projects@FreeBSD.ORG  Fri Dec 12 06:01:30 2008
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 92FAB1065677;
	Fri, 12 Dec 2008 06:01:30 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 828998FC0C;
	Fri, 12 Dec 2008 06:01:30 +0000 (UTC) (envelope-from sam@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 mBC61Ubo088345;
	Fri, 12 Dec 2008 06:01:30 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBC61UFJ088344;
	Fri, 12 Dec 2008 06:01:30 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200812120601.mBC61UFJ088344@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Fri, 12 Dec 2008 06:01:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185974 - projects/arpv2_merge_1/sys/netinet
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Dec 2008 06:01:30 -0000

Author: sam
Date: Fri Dec 12 06:01:30 2008
New Revision: 185974
URL: http://svn.freebsd.org/changeset/base/185974

Log:
  o fix comment
  o compare ptr to NULL

Modified:
  projects/arpv2_merge_1/sys/netinet/in.c

Modified: projects/arpv2_merge_1/sys/netinet/in.c
==============================================================================
--- projects/arpv2_merge_1/sys/netinet/in.c	Fri Dec 12 06:01:09 2008	(r185973)
+++ projects/arpv2_merge_1/sys/netinet/in.c	Fri Dec 12 06:01:30 2008	(r185974)
@@ -1040,9 +1040,9 @@ in_lltable_new(const struct sockaddr *l3
 		return NULL;
 
 	callout_init(&lle->base.la_timer, CALLOUT_MPSAFE);
-	/* qing
+	/*
 	 * For IPv4 this will trigger "arpresolve" to generate
-	 * an ARP request 
+	 * an ARP request.
 	 */
 	lle->base.la_expire = time_second; /* mark expired */
 	lle->l3_addr4 = *(const struct sockaddr_in *)l3addr;
@@ -1085,9 +1085,8 @@ in_lltable_rtcheck(struct ifnet *ifp, co
 }
 
 /*
- * Returns NULL if not found or marked for deletion
- * if found returns lle read locked
- *
+ * Return NULL if not found or marked for deletion.
+ * If found return lle read locked.
  */
 static struct llentry *
 in_lltable_lookup(struct lltable *llt, u_int flags, const struct sockaddr *l3addr)
@@ -1148,7 +1147,7 @@ in_lltable_lookup(struct lltable *llt, u
 #endif
 		lle = NULL;
 	}
-	if (lle) {
+	if (lle != NULL) {
 		if (flags & LLE_EXCLUSIVE)
 			LLE_WLOCK(lle);
 		else