From owner-p4-projects@FreeBSD.ORG  Mon Jul  3 10:56:27 2006
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 8E2DE16A415; Mon,  3 Jul 2006 10:56:27 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 51C4316A403
	for <perforce@freebsd.org>; Mon,  3 Jul 2006 10:56:27 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 15F1543D49
	for <perforce@freebsd.org>; Mon,  3 Jul 2006 10:56:27 +0000 (GMT)
	(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 k63AuQIG071732
	for <perforce@freebsd.org>; Mon, 3 Jul 2006 10:56:26 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k63AuQID071729
	for perforce@freebsd.org; Mon, 3 Jul 2006 10:56:26 GMT
	(envelope-from piso@freebsd.org)
Date: Mon, 3 Jul 2006 10:56:26 GMT
Message-Id: <200607031056.k63AuQID071729@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 100487 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, 03 Jul 2006 10:56:27 -0000

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

Change 100487 by piso@piso_longino on 2006/07/03 10:55:37

	Fixes kernel compilation.

Affected files ...

.. //depot/projects/soc2006/intr_filter/dev/nfe/if_nfe.c#2 edit
.. //depot/projects/soc2006/intr_filter/dev/re/if_re.c#4 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/dev/nfe/if_nfe.c#2 (text+ko) ====

@@ -378,7 +378,7 @@
 	ether_ifattach(ifp, sc->eaddr);
 
 	error = bus_setup_intr(dev, sc->nfe_irq, INTR_TYPE_NET|INTR_MPSAFE,
-	    nfe_intr, sc, &sc->nfe_intrhand);
+	    NULL, nfe_intr, sc, &sc->nfe_intrhand);
 
 	if (error) {
 		printf("nfe%d: couldn't set up irq\n", unit);

==== //depot/projects/soc2006/intr_filter/dev/re/if_re.c#4 (text+ko) ====

@@ -239,7 +239,7 @@
 static void re_poll		(struct ifnet *, enum poll_cmd, int);
 static void re_poll_locked	(struct ifnet *, enum poll_cmd, int);
 #endif
-static void re_intr		(void *);
+static int re_intr		(void *);
 static void re_tick		(void *);
 static void re_tx_task		(void *, int);
 static void re_int_task		(void *, int);
@@ -1899,7 +1899,7 @@
 	status = CSR_READ_2(sc, RL_ISR);
 	if (status == 0xFFFF || (status & RL_INTRS_CPLUS) == 0) {
 		mtx_unlock_spin(&sc->rl_intlock);
-                return;
+                return(FILTER_STRAY);
 	}
 	CSR_WRITE_2(sc, RL_IMR, 0);
 	mtx_unlock_spin(&sc->rl_intlock);