From owner-svn-src-projects@FreeBSD.ORG Sat Dec 13 06:41:25 2008 Return-Path: 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 AA3EE1065670; Sat, 13 Dec 2008 06:41:25 +0000 (UTC) (envelope-from qingli@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9B0218FC0C; Sat, 13 Dec 2008 06:41:25 +0000 (UTC) (envelope-from qingli@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 mBD6fPOv021317; Sat, 13 Dec 2008 06:41:25 GMT (envelope-from qingli@svn.freebsd.org) Received: (from qingli@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBD6fPtk021315; Sat, 13 Dec 2008 06:41:25 GMT (envelope-from qingli@svn.freebsd.org) Message-Id: <200812130641.mBD6fPtk021315@svn.freebsd.org> From: Qing Li Date: Sat, 13 Dec 2008 06:41:25 +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: r186027 - projects/arpv2_merge_1/sys/netinet6 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Dec 2008 06:41:25 -0000 Author: qingli Date: Sat Dec 13 06:41:25 2008 New Revision: 186027 URL: http://svn.freebsd.org/changeset/base/186027 Log: remove marker Modified: projects/arpv2_merge_1/sys/netinet6/in6.c projects/arpv2_merge_1/sys/netinet6/nd6.c Modified: projects/arpv2_merge_1/sys/netinet6/in6.c ============================================================================== --- projects/arpv2_merge_1/sys/netinet6/in6.c Sat Dec 13 06:04:34 2008 (r186026) +++ projects/arpv2_merge_1/sys/netinet6/in6.c Sat Dec 13 06:41:25 2008 (r186027) @@ -2207,9 +2207,9 @@ in6_lltable_lookup(struct lltable *llt, #ifdef INVARIANTS log(LOG_INFO, "ifaddr cache = %p is deleted\n", lle); #endif - lle = NULL; + lle = (void *)-1; } - if (lle) { + if (lle != NULL && lle != (void *)-1) { if (flags & LLE_EXCLUSIVE) LLE_WLOCK(lle); else Modified: projects/arpv2_merge_1/sys/netinet6/nd6.c ============================================================================== --- projects/arpv2_merge_1/sys/netinet6/nd6.c Sat Dec 13 06:04:34 2008 (r186026) +++ projects/arpv2_merge_1/sys/netinet6/nd6.c Sat Dec 13 06:41:25 2008 (r186027) @@ -857,7 +857,7 @@ nd6_purge(struct ifnet *ifp) */ } -/* Qing +/* * the caller acquires and releases the lock on the lltbls * Returns the llentry locked */