From owner-svn-src-projects@FreeBSD.ORG  Sun Dec 14 02:44:58 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 C307B1065670;
	Sun, 14 Dec 2008 02:44:58 +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 B47E98FC13;
	Sun, 14 Dec 2008 02:44:58 +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 mBE2iwFF046915;
	Sun, 14 Dec 2008 02:44:58 GMT (envelope-from qingli@svn.freebsd.org)
Received: (from qingli@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBE2iwq5046914;
	Sun, 14 Dec 2008 02:44:58 GMT (envelope-from qingli@svn.freebsd.org)
Message-Id: <200812140244.mBE2iwq5046914@svn.freebsd.org>
From: Qing Li <qingli@FreeBSD.org>
Date: Sun, 14 Dec 2008 02:44:58 +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: r186071 - 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: Sun, 14 Dec 2008 02:44:58 -0000

Author: qingli
Date: Sun Dec 14 02:44:58 2008
New Revision: 186071
URL: http://svn.freebsd.org/changeset/base/186071

Log:
  We will delete the interface address ARP entry only
  when we remove the address.

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	Sun Dec 14 01:12:55 2008	(r186070)
+++ projects/arpv2_merge_1/sys/netinet/in.c	Sun Dec 14 02:44:58 2008	(r186071)
@@ -1140,12 +1140,14 @@ in_lltable_lookup(struct lltable *llt, u
 		lle->lle_head = lleh;
 		LIST_INSERT_HEAD(lleh, lle, lle_next);
 	} else if (flags & LLE_DELETE) {
-		LLE_WLOCK(lle);
-		lle->la_flags = LLE_DELETED;
-		LLE_WUNLOCK(lle);
+		if (!(lle->la_flags & LLE_IFADDR) || (flags & LLE_IFADDR)) {
+			LLE_WLOCK(lle);
+			lle->la_flags = LLE_DELETED;
+			LLE_WUNLOCK(lle);
 #ifdef DIAGNOSTICS
-		log(LOG_INFO, "ifaddr cache = %p  is deleted\n", lle);	
+			log(LOG_INFO, "ifaddr cache = %p  is deleted\n", lle);	
 #endif
+		}
 		lle = (void *)-1;
 		
 	}