From owner-p4-projects@FreeBSD.ORG  Sun Sep 23 05:59:01 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7AA1416A421; Sun, 23 Sep 2007 05:59:01 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4C32F16A418
	for <perforce@freebsd.org>; Sun, 23 Sep 2007 05:59:01 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5454B13C461
	for <perforce@freebsd.org>; Sun, 23 Sep 2007 05:59:01 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8N5x11c020884
	for <perforce@freebsd.org>; Sun, 23 Sep 2007 05:59:01 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8N5x05g020881
	for perforce@freebsd.org; Sun, 23 Sep 2007 05:59:00 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sun, 23 Sep 2007 05:59:00 GMT
Message-Id: <200709230559.l8N5x05g020881@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 126708 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Sep 2007 05:59:01 -0000

http://perforce.freebsd.org/chv.cgi?CH=126708

Change 126708 by kmacy@kmacy_home:ethng on 2007/09/23 05:58:54

	remove attempt to only call rt_check when needed
	the locking is far more convoluted than it appears

Affected files ...

.. //depot/projects/ethng/src/sys/netinet/if_ether.c#4 edit

Differences ...

==== //depot/projects/ethng/src/sys/netinet/if_ether.c#4 (text+ko) ====

@@ -358,7 +358,7 @@
 	struct llinfo_arp *la = NULL;
 	struct rtentry *rt = NULL;
 	struct sockaddr_dl *sdl;
-	int error = 0;
+	int error;
 
 	if (m->m_flags & M_BCAST) {	/* broadcast */
 		(void)memcpy(desten, ifp->if_broadcastaddr, ifp->if_addrlen);
@@ -370,11 +370,7 @@
 	}
 
 	if (rt0 != NULL) {
-		if (((rt0->rt_flags && RTF_UP) == 0) ||
-		    ((rt0->rt_flags & RTF_GATEWAY) && (rt0->rt_gateway == NULL)))
-			error = rt_check(&rt, &rt0, dst);
-		else
-			rt = rt0;
+		error = rt_check(&rt, &rt0, dst);
 		if (error) {
 			m_freem(m);
 			return error;