From owner-p4-projects@FreeBSD.ORG  Mon Dec 15 09:03:36 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 325E0106567A; Mon, 15 Dec 2008 09:03:36 +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 E903E1065672
	for <perforce@freebsd.org>; Mon, 15 Dec 2008 09:03:35 +0000 (UTC)
	(envelope-from zec@icir.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C15F58FC1C
	for <perforce@freebsd.org>; Mon, 15 Dec 2008 09:03:35 +0000 (UTC)
	(envelope-from zec@icir.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBF93ZPV026616
	for <perforce@freebsd.org>; Mon, 15 Dec 2008 09:03:35 GMT
	(envelope-from zec@icir.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBF93Zkh026614
	for perforce@freebsd.org; Mon, 15 Dec 2008 09:03:35 GMT
	(envelope-from zec@icir.org)
Date: Mon, 15 Dec 2008 09:03:35 GMT
Message-Id: <200812150903.mBF93Zkh026614@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@icir.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 154694 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, 15 Dec 2008 09:03:36 -0000

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

Change 154694 by zec@zec_tca51 on 2008/12/15 09:03:03

	Fix misintegration.

Affected files ...

.. //depot/projects/vimage/src/sys/netinet/if_ether.c#33 edit

Differences ...

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

@@ -110,8 +110,8 @@
 
 static void	arp_init(void);
 void		arprequest(struct ifnet *,
+			struct in_addr *, struct in_addr *, u_char *);
 static int	arp_iattach(const void *);
-			struct in_addr *, struct in_addr *, u_char *);
 static void	arpintr(struct mbuf *);
 static void	arptimer(void *);
 #ifdef INET