From owner-p4-projects@FreeBSD.ORG  Mon Sep  1 17:35:23 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 04A3A1065670; Mon,  1 Sep 2008 17:35:23 +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 B5D5C106566B
	for <perforce@freebsd.org>; Mon,  1 Sep 2008 17:35:22 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A17128FC15
	for <perforce@freebsd.org>; Mon,  1 Sep 2008 17:35:22 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m81HZMGU086641
	for <perforce@freebsd.org>; Mon, 1 Sep 2008 17:35:22 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m81HZM6X086634
	for perforce@freebsd.org; Mon, 1 Sep 2008 17:35:22 GMT
	(envelope-from thompsa@freebsd.org)
Date: Mon, 1 Sep 2008 17:35:22 GMT
Message-Id: <200809011735.m81HZM6X086634@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 148988 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, 01 Sep 2008 17:35:23 -0000

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

Change 148988 by thompsa@thompsa_burger on 2008/09/01 17:34:23

	Fix build with cloning changes.

Affected files ...

.. //depot/projects/vap/sys/contrib/pf/net/if_pflog.c#6 edit
.. //depot/projects/vap/sys/net/if_disc.c#8 edit
.. //depot/projects/vap/sys/net/if_edsc.c#4 edit
.. //depot/projects/vap/sys/net/if_enc.c#7 edit
.. //depot/projects/vap/sys/net/if_faith.c#9 edit
.. //depot/projects/vap/sys/net/if_gif.c#10 edit
.. //depot/projects/vap/sys/net/if_gre.c#12 edit
.. //depot/projects/vap/sys/net/if_lagg.c#7 edit
.. //depot/projects/vap/sys/net/if_ppp.c#8 edit
.. //depot/projects/vap/sys/net/if_stf.c#10 edit
.. //depot/projects/vap/sys/net/if_vlan.c#10 edit

Differences ...

==== //depot/projects/vap/sys/contrib/pf/net/if_pflog.c#6 (text+ko) ====

@@ -70,6 +70,7 @@
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/sockio.h>
+#include <sys/uio.h>
 #else
 #include <sys/ioctl.h>
 #endif
@@ -117,7 +118,7 @@
 int	pflogioctl(struct ifnet *, u_long, caddr_t);
 void	pflogstart(struct ifnet *);
 #ifdef __FreeBSD__
-static int pflog_clone_create(struct if_clone *, int, caddr_t);
+static int pflog_clone_create(struct if_clone *, int, enum uio_seg, caddr_t);
 static void pflog_clone_destroy(struct ifnet *);
 #else
 int	pflog_clone_create(struct if_clone *, int);
@@ -153,7 +154,7 @@
 
 #ifdef __FreeBSD__
 static int
-pflog_clone_create(struct if_clone *ifc, int unit, caddr_t param)
+pflog_clone_create(struct if_clone *ifc, int unit, enum uio_seg as, caddr_t param)
 #else
 int
 pflog_clone_create(struct if_clone *ifc, int unit)

==== //depot/projects/vap/sys/net/if_disc.c#8 (text+ko) ====

@@ -43,6 +43,7 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
+#include <sys/uio.h>
 
 #include <net/if.h>
 #include <net/if_clone.h>

==== //depot/projects/vap/sys/net/if_edsc.c#4 (text+ko) ====

@@ -42,6 +42,7 @@
 #include <sys/mbuf.h>		/* mbuf(9) */
 #include <sys/socket.h>		/* struct ifreq */
 #include <sys/sockio.h>		/* socket ioctl's */
+#include <sys/uio.h>
 /* #include <sys/systm.h> if you need printf(9) or other all-purpose globals */
 
 #include <net/bpf.h>		/* bpf(9) */

==== //depot/projects/vap/sys/net/if_enc.c#7 (text+ko) ====

@@ -38,6 +38,7 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
+#include <sys/uio.h>
 
 #include <net/if.h>
 #include <net/if_clone.h>

==== //depot/projects/vap/sys/net/if_faith.c#9 (text+ko) ====

@@ -54,6 +54,7 @@
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/malloc.h>
+#include <sys/uio.h>
 #include <sys/vimage.h>
 
 #include <net/if.h>

==== //depot/projects/vap/sys/net/if_gif.c#10 (text+ko) ====

@@ -49,6 +49,7 @@
 #include <sys/proc.h>
 #include <sys/protosw.h>
 #include <sys/conf.h>
+#include <sys/uio.h>
 #include <sys/vimage.h>
 #include <machine/cpu.h>
 

==== //depot/projects/vap/sys/net/if_gre.c#12 (text+ko) ====

@@ -64,6 +64,7 @@
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
+#include <sys/uio.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>

==== //depot/projects/vap/sys/net/if_lagg.c#7 (text+ko) ====

@@ -39,6 +39,7 @@
 #include <sys/lock.h>
 #include <sys/rwlock.h>
 #include <sys/taskqueue.h>
+#include <sys/uio.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>

==== //depot/projects/vap/sys/net/if_ppp.c#8 (text+ko) ====

@@ -98,6 +98,7 @@
 #include <sys/time.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
+#include <sys/uio.h>
 
 #include <net/if.h>
 #include <net/if_clone.h>

==== //depot/projects/vap/sys/net/if_stf.c#10 (text+ko) ====

@@ -89,6 +89,7 @@
 #include <sys/protosw.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
+#include <sys/uio.h>
 #include <machine/cpu.h>
 
 #include <sys/malloc.h>

==== //depot/projects/vap/sys/net/if_vlan.c#10 (text+ko) ====

@@ -55,6 +55,7 @@
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
+#include <sys/uio.h>
 #include <sys/vimage.h>
 
 #include <net/bpf.h>