From owner-p4-projects@FreeBSD.ORG  Sat Dec 15 04:25:39 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ABCD816A468; Sat, 15 Dec 2007 04:25:39 +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 49E0116A41A
	for <perforce@freebsd.org>; Sat, 15 Dec 2007 04:25:39 +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 34BAE13C44B
	for <perforce@freebsd.org>; Sat, 15 Dec 2007 04:25:39 +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 lBF4Pdtg014945
	for <perforce@freebsd.org>; Sat, 15 Dec 2007 04:25:39 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBF4PdCA014942
	for perforce@freebsd.org; Sat, 15 Dec 2007 04:25:39 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 15 Dec 2007 04:25:39 GMT
Message-Id: <200712150425.lBF4PdCA014942@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 130935 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: Sat, 15 Dec 2007 04:25:40 -0000

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

Change 130935 by kmacy@kmacy:storage:toestack on 2007/12/15 04:24:38

	move arp notification handler further up so that it is always called
	for a reply

Affected files ...

.. //depot/projects/toestack/sys/netinet/if_ether.c#15 edit

Differences ...

==== //depot/projects/toestack/sys/netinet/if_ether.c#15 (text+ko) ====

@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/if_ether.c,v 1.165 2007/12/04 13:01:12 yar Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/if_ether.c,v 1.166 2007/12/12 20:53:24 kmacy Exp $");
 
 #include "opt_inet.h"
 #include "opt_mac.h"
@@ -674,6 +674,11 @@
 	rt = arplookup(isaddr.s_addr, itaddr.s_addr == myaddr.s_addr, 0);
 	if (rt != NULL) {
 		la = (struct llinfo_arp *)rt->rt_llinfo;
+
+		sin.sin_addr.s_addr = isaddr.s_addr;
+		EVENTHANDLER_INVOKE(route_event, RTEVENT_ARP_UPDATE, rt, NULL,
+		    (struct sockaddr *)&sin);
+
 		if (la == NULL) {
 			RT_UNLOCK(rt);
 			goto reply;
@@ -781,9 +786,6 @@
 	la->la_preempt = arp_maxtries;
 	hold = la->la_hold;
 	la->la_hold = NULL;
-
-	sin.sin_addr.s_addr = be32toh(itaddr.s_addr);
-	EVENTHANDLER_INVOKE(route_event, RTEVENT_ARP_UPDATE, rt, NULL, (struct sockaddr *)&sin);
 	RT_UNLOCK(rt);
 	if (hold != NULL)
 		(*ifp->if_output)(ifp, hold, rt_key(rt), rt);