From owner-p4-projects@FreeBSD.ORG  Tue Dec  9 10:23:45 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9AB4C16A4D0; Tue,  9 Dec 2003 10:23:45 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7505616A4CE
	for <perforce@freebsd.org>; Tue,  9 Dec 2003 10:23:45 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 805F443D2A
	for <perforce@freebsd.org>; Tue,  9 Dec 2003 10:23:44 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9INiXJ013615
	for <perforce@freebsd.org>; Tue, 9 Dec 2003 10:23:44 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9INh9p013612
	for perforce@freebsd.org; Tue, 9 Dec 2003 10:23:43 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Tue, 9 Dec 2003 10:23:43 -0800 (PST)
Message-Id: <200312091823.hB9INh9p013612@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>
Subject: PERFORCE change 43686 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 09 Dec 2003 18:23:46 -0000

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

Change 43686 by sam@sam_ebb on 2003/12/09 10:23:41

	IFC

Affected files ...

.. //depot/projects/netperf+sockets/sys/netatalk/ddp_usrreq.c#3 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/netatalk/ddp_usrreq.c#3 (text+ko) ====

@@ -2,7 +2,7 @@
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  *
- * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.30 2003/03/04 23:19:51 jlemon Exp $
+ * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.33 2003/11/18 00:39:03 rwatson Exp $
  */
 
 #include <sys/param.h>
@@ -459,7 +459,7 @@
     }
 
     if ( ddp->ddp_route.ro_rt ) {
-	rtfree( ddp->ddp_route.ro_rt );
+	RTFREE( ddp->ddp_route.ro_rt );
     }
 
     if ( ddp->ddp_prev ) {
@@ -553,9 +553,9 @@
 	mtx_init(&atintrq1.ifq_mtx, "at1_inq", NULL, MTX_DEF);
 	mtx_init(&atintrq2.ifq_mtx, "at2_inq", NULL, MTX_DEF);
 	mtx_init(&aarpintrq.ifq_mtx, "aarp_inq", NULL, MTX_DEF);
-	netisr_register(NETISR_ATALK1, at1intr, &atintrq1);
-	netisr_register(NETISR_ATALK2, at2intr, &atintrq2);
-	netisr_register(NETISR_AARP, aarpintr, &aarpintrq);
+	netisr_register(NETISR_ATALK1, at1intr, &atintrq1, 0);
+	netisr_register(NETISR_ATALK2, at2intr, &atintrq2, 0);
+	netisr_register(NETISR_AARP, aarpintr, &aarpintrq, 0);
 }
 
 #if 0
@@ -590,5 +590,6 @@
 	at_setsockaddr,
 	sosend,
 	soreceive,
-	sopoll
+	sopoll,
+	pru_sosetlabel_null
 };