From owner-p4-projects@FreeBSD.ORG  Mon Dec  1 21:18:27 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 989BB1065677; Mon,  1 Dec 2008 21:18:27 +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 5C4031065673
	for <perforce@freebsd.org>; Mon,  1 Dec 2008 21:18:27 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4A0B28FC0A
	for <perforce@freebsd.org>; Mon,  1 Dec 2008 21:18:27 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB1LIRBQ024092
	for <perforce@freebsd.org>; Mon, 1 Dec 2008 21:18:27 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB1LIRUU024090
	for perforce@freebsd.org; Mon, 1 Dec 2008 21:18:27 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 1 Dec 2008 21:18:27 GMT
Message-Id: <200812012118.mB1LIRUU024090@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 153914 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 Dec 2008 21:18:27 -0000

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

Change 153914 by sam@sam_ebb on 2008/12/01 21:17:44

	another cloner that requires local TLC

Affected files ...

.. //depot/projects/vap/sys/netinet/ip_carp.c#11 edit

Differences ...

==== //depot/projects/vap/sys/netinet/ip_carp.c#11 (text+ko) ====

@@ -49,6 +49,7 @@
 #include <sys/signalvar.h>
 #include <sys/filio.h>
 #include <sys/sockio.h>
+#include <sys/uio.h>
 
 #include <sys/socket.h>
 #include <sys/vnode.h>
@@ -192,7 +193,8 @@
 		    unsigned char *);
 static void	carp_setroute(struct carp_softc *, int);
 static void	carp_input_c(struct mbuf *, struct carp_header *, sa_family_t);
-static int 	carp_clone_create(struct if_clone *, int, caddr_t);
+static int 	carp_clone_create(struct if_clone *, int, enum uio_seg,
+		    caddr_t);
 static void 	carp_clone_destroy(struct ifnet *);
 static void	carpdetach(struct carp_softc *, int);
 static int	carp_prepare_ad(struct mbuf *, struct carp_softc *,
@@ -382,7 +384,8 @@
 }
 
 static int
-carp_clone_create(struct if_clone *ifc, int unit, caddr_t params)
+carp_clone_create(struct if_clone *ifc, int unit, enum uio_seg as,
+	caddr_t params)
 {
 
 	struct carp_softc *sc;