From owner-svn-src-projects@FreeBSD.ORG  Mon Dec  1 22:37:37 2014
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: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 B92ED6A2;
 Mon,  1 Dec 2014 22:37:37 +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 A5D49214;
 Mon,  1 Dec 2014 22:37:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB1MbbRp000809;
 Mon, 1 Dec 2014 22:37:37 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB1MbbQO000808;
 Mon, 1 Dec 2014 22:37:37 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201412012237.sB1MbbQO000808@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
 melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Mon, 1 Dec 2014 22:37:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r275383 - projects/routing/sys/netinet
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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: Mon, 01 Dec 2014 22:37:37 -0000

Author: melifaro
Date: Mon Dec  1 22:37:36 2014
New Revision: 275383
URL: https://svnweb.freebsd.org/changeset/base/275383

Log:
  Put bandaid on arptimer-derived crashed for 'arp -da' deleted records.
  The proper fix will arrive after convering lltable 'delete' method.

Modified:
  projects/routing/sys/netinet/if_ether.c

Modified: projects/routing/sys/netinet/if_ether.c
==============================================================================
--- projects/routing/sys/netinet/if_ether.c	Mon Dec  1 21:43:48 2014	(r275382)
+++ projects/routing/sys/netinet/if_ether.c	Mon Dec  1 22:37:36 2014	(r275383)
@@ -192,6 +192,27 @@ arptimer(void *arg)
 		return;
 	}
 
+	if (lle->la_falgs & LLE_DELETED) {
+		/* XXX: Temporary */
+		/* We have been deleted. Drop callref and return */
+		if ((lle->la_flags & LLE_CALLOUTREF) != 0) {
+			LLE_REMREF(lle);
+			lle->la_flags &= ~LLE_CALLOUTREF;
+		}
+
+		pkts_dropped = llentry_free(lle);
+		ARPSTAT_ADD(dropped, pkts_dropped);
+		return;
+	}
+
+	/* Unlink entry */
+	IF_AFDATA_RUN_WLOCK(ifp);
+	llentry_unlink(lle);
+	IF_AFDATA_RUN_WUNLOCK(ifp);
+
+	pkts_dropped = llentry_free(lle);
+	ARPSTAT_ADD(dropped, pkts_dropped);
+
 	la_flags = lle->la_flags;
 	state = (la_flags & LLE_DELETED) ? ARP_LLINFO_DELETED : lle->ln_state;
 	ifp = lle->lle_tbl->llt_ifp;