From owner-p4-projects@FreeBSD.ORG  Mon Jan 29 23:44:32 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 090E016A404; Mon, 29 Jan 2007 23:44:32 +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 BCA4F16A402
	for <perforce@freebsd.org>; Mon, 29 Jan 2007 23:44:31 +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 AF1B513C467
	for <perforce@freebsd.org>; Mon, 29 Jan 2007 23:44:31 +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 l0TNiVXU060053
	for <perforce@freebsd.org>; Mon, 29 Jan 2007 23:44:31 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0TNiVOE060050
	for perforce@freebsd.org; Mon, 29 Jan 2007 23:44:31 GMT
	(envelope-from piso@freebsd.org)
Date: Mon, 29 Jan 2007 23:44:31 GMT
Message-Id: <200701292344.l0TNiVOE060050@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 113677 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 Jan 2007 23:44:32 -0000

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

Change 113677 by piso@piso_newluxor on 2007/01/29 23:44:30

	Axe gargabe that crept in during the last IFC.

Affected files ...

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

Differences ...

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

@@ -1212,26 +1212,15 @@
 }
 
 /* Local prototypes */
-#ifdef _KERNEL
 static int
-LibAliasOutLocked(struct libalias *la, struct mbuf *ptr, int maxpacketsize,
-    int create);
+LibAliasOutLocked(struct libalias *la, char *ptr,
+		  int maxpacketsize, int create);
 static int
-LibAliasInLocked(struct libalias *la, struct mbuf *ptr, int maxpacketsize);
-#else
-static int
-LibAliasOutLocked(struct libalias *la, char *ptr,int maxpacketsize, 
-    int create);
-static int
-LibAliasInLocked(struct libalias *la, char *ptr, int maxpacketsize);
-#endif
+LibAliasInLocked(struct libalias *la, char *ptr,
+		  int maxpacketsize);
 
 int
-#ifdef _KERNEL
-LibAliasIn(struct libalias *la, struct mbuf *ptr, int maxpacketsize)
-#else
 LibAliasIn(struct libalias *la, char *ptr, int maxpacketsize)
-#endif
 {
 	int res;
 
@@ -1242,11 +1231,7 @@
 }
 
 static int
-#ifdef _KERNEL
-LibAliasInLocked(struct libalias *la, struct mbuf *ptr, int maxpacketsize)
-#else
 LibAliasInLocked(struct libalias *la, char *ptr, int maxpacketsize)
-#endif
 {
 	struct in_addr alias_addr;
 	struct ip *pip;