From owner-p4-projects@FreeBSD.ORG  Thu May 22 00:58:46 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A89841065690; Thu, 22 May 2008 00:58:46 +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 69FCC106568E
	for <perforce@freebsd.org>; Thu, 22 May 2008 00:58:46 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5BC498FC12
	for <perforce@freebsd.org>; Thu, 22 May 2008 00:58:46 +0000 (UTC)
	(envelope-from julian@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 m4M0wkmp055901
	for <perforce@freebsd.org>; Thu, 22 May 2008 00:58:46 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4M0wkXZ055890
	for perforce@freebsd.org; Thu, 22 May 2008 00:58:46 GMT
	(envelope-from julian@freebsd.org)
Date: Thu, 22 May 2008 00:58:46 GMT
Message-Id: <200805220058.m4M0wkXZ055890@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 142005 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: Thu, 22 May 2008 00:58:46 -0000

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

Change 142005 by julian@julian_trafmon1 on 2008/05/22 00:58:26

	fix slight mismerge parts

Affected files ...

.. //depot/projects/arp-v2/src/sys/netinet/if_ether.c#5 edit

Differences ...

==== //depot/projects/arp-v2/src/sys/netinet/if_ether.c#5 (text+ko) ====

@@ -238,7 +238,6 @@
 	struct llentry *la = 0;
 	u_int flags;
 	int error;
-	int fibnum = 0;
 
 	*lle = NULL;
 
@@ -254,7 +253,6 @@
 			ETHER_MAP_IP_MULTICAST(&SIN(dst)->sin_addr, desten);
 			return (0);
 		}
-		fibnum = M_GETFIB(m);
 	}
 	if (!ifp)
 		panic("%s: invalid interface pointer", __func__);
@@ -431,9 +429,6 @@
 */
 	int req_len;
 	int bridged = 0;
-	u_int fibnum;
-	u_int goodfib = 0;
-	int firstpass = 1;
 #ifdef DEV_CARP
 	int carp_match = 0;
 #endif
@@ -548,7 +543,7 @@
 				    la->lle_tbl->llt_ifp->if_xname,
 				    ifp->if_addrlen, (u_char *)ar_sha(ah), ":",
 				    ifp->if_xname);
-			continue;
+			goto reply;
 		}
 
 		if (flag & LLE_CREATE)
@@ -642,6 +637,7 @@
 		(void)memcpy(ar_tha(ah), ar_sha(ah), ah->ar_hln);
 		(void)memcpy(ar_sha(ah), enaddr, ah->ar_hln);
 	} else {
+		if (la == NULL) {
 			if (!arp_proxyall)
 				goto drop;