From owner-svn-src-all@FreeBSD.ORG  Wed Jul  3 17:27:33 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 13597DC1;
 Wed,  3 Jul 2013 17:27:33 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 04A6B1A21;
 Wed,  3 Jul 2013 17:27:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r63HRWo8048887;
 Wed, 3 Jul 2013 17:27:32 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r63HRWO6048886;
 Wed, 3 Jul 2013 17:27:32 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201307031727.r63HRWO6048886@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Wed, 3 Jul 2013 17:27:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252577 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Jul 2013 17:27:33 -0000

Author: np
Date: Wed Jul  3 17:27:32 2013
New Revision: 252577
URL: http://svnweb.freebsd.org/changeset/base/252577

Log:
  Catch up with r238990.  LLE_DELETED does not clobber everything else in
  la_flags since said revision.

Modified:
  head/sys/netinet/if_ether.c

Modified: head/sys/netinet/if_ether.c
==============================================================================
--- head/sys/netinet/if_ether.c	Wed Jul  3 17:26:05 2013	(r252576)
+++ head/sys/netinet/if_ether.c	Wed Jul  3 17:27:32 2013	(r252577)
@@ -174,7 +174,7 @@ arptimer(void *arg)
 	ifp = lle->lle_tbl->llt_ifp;
 	CURVNET_SET(ifp->if_vnet);
 
-	if (lle->la_flags != LLE_DELETED) {
+	if ((lle->la_flags & LLE_DELETED) == 0) {
 		int evt;
 
 		if (lle->la_flags & LLE_VALID)