From owner-p4-projects@FreeBSD.ORG  Tue Jan 30 15:54:25 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EB99B16A408; Tue, 30 Jan 2007 15:54:24 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9693616A403
	for <perforce@freebsd.org>; Tue, 30 Jan 2007 15:54:24 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 877CD13C474
	for <perforce@freebsd.org>; Tue, 30 Jan 2007 15:54:24 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0UFsOg4092427
	for <perforce@freebsd.org>; Tue, 30 Jan 2007 15:54:24 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0UFsOZs092418
	for perforce@freebsd.org; Tue, 30 Jan 2007 15:54:24 GMT
	(envelope-from piso@freebsd.org)
Date: Tue, 30 Jan 2007 15:54:24 GMT
Message-Id: <200701301554.l0UFsOZs092418@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 113710 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: Tue, 30 Jan 2007 15:54:25 -0000

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

Change 113710 by piso@piso_newluxor on 2007/01/30 15:53:52

	Switch FragmentIn()'s "struct ip *" arg to a "void *" arg.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#42 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#42 (text+ko) ====

@@ -1126,14 +1126,21 @@
 */
 
 /* Local prototypes */
-static int	FragmentIn(struct libalias *, struct ip *);
+static int	FragmentIn(struct libalias *, void *);
 static int	FragmentOut(struct libalias *, struct ip *);
 
 
 static int
-FragmentIn(struct libalias *la, struct ip *pip)
+FragmentIn(struct libalias *la, void *ptr)
 {
 	struct alias_link *lnk;
+	struct ip *pip;
+#ifdef _KERNEL
+	// XXX - m_pullup()
+	pip = ptr;
+#else
+	pip = ptr;
+#endif
 
 	LIBALIAS_LOCK_ASSERT(la);
 	lnk = FindFragmentIn2(la, pip->ip_src, pip->ip_dst, pip->ip_id);