From owner-p4-projects@FreeBSD.ORG  Mon Oct 29 23:32:59 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D1FFA16A46B; Mon, 29 Oct 2007 23:32:58 +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 6C1D516A41B
	for <perforce@freebsd.org>; Mon, 29 Oct 2007 23:32:58 +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 5FC7C13C4A8
	for <perforce@freebsd.org>; Mon, 29 Oct 2007 23:32:58 +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 l9TNWwPp064217
	for <perforce@freebsd.org>; Mon, 29 Oct 2007 23:32:58 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9TNWw5B064214
	for perforce@freebsd.org; Mon, 29 Oct 2007 23:32:58 GMT
	(envelope-from kmacy@freebsd.org)
Date: Mon, 29 Oct 2007 23:32:58 GMT
Message-Id: <200710292332.l9TNWw5B064214@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 128310 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: Mon, 29 Oct 2007 23:32:59 -0000

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

Change 128310 by kmacy@kmacy:storage:toestack on 2007/10/29 23:32:33

	make arp_update into a more generic route_event
	fix signature for arp_ifinit_internal

Affected files ...

.. //depot/projects/toestack/sys/net/if_arp.h#3 edit
.. //depot/projects/toestack/sys/net/route.h#4 edit
.. //depot/projects/toestack/sys/netinet/if_ether.c#7 edit

Differences ...

==== //depot/projects/toestack/sys/net/if_arp.h#3 (text+ko) ====

@@ -108,9 +108,6 @@
 #define IFP2AC(ifp) ((struct arpcom *)(ifp->if_l2com))
 #define AC2IFP(ac) ((ac)->ac_ifp)
 
-typedef void (*arpupdate_fn)(struct rtentry *);
-EVENTHANDLER_DECLARE(arp_update, arpupdate_fn);
-
 #endif
 
 #endif /* !_NET_IF_ARP_H_ */

==== //depot/projects/toestack/sys/net/route.h#4 (text+ko) ====

@@ -364,6 +364,15 @@
 	    struct sockaddr *, struct sockaddr *, int, struct rtentry **);
 int	 rtrequest1(int, struct rt_addrinfo *, struct rtentry **);
 int	 rt_check(struct rtentry **, struct rtentry **, struct sockaddr *);
+
+
+#include <sys/eventhandler.h>
+#define RTEVENT_ARP_UPDATE 1
+typedef void (*rtevent_fn)(void *, int, struct rtentry *);
+EVENTHANDLER_DECLARE(route_event, rtevent_fn);
+
+
+
 #endif
 
 #endif

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

@@ -415,7 +415,7 @@
 	    sdl->sdl_family == AF_LINK && sdl->sdl_alen != 0) {
 
 		bcopy(LLADDR(sdl), desten, sdl->sdl_alen);
-		EVENTHANDLER_INVOKE(arp_update, rt);
+		EVENTHANDLER_INVOKE(route_event, RTEVENT_ARP_UPDATE, rt);
 		
 		/*
 		 * If entry has an expiry time and it is approaching,
@@ -941,7 +941,7 @@
 	}
 }
 
-static __inline
+static __inline void
 arp_ifinit_internal(struct ifnet *ifp, struct ifaddr *ifa, u_char *enaddr)
 {
 	if (ntohl(IA_SIN(ifa)->sin_addr.s_addr) != INADDR_ANY)