From owner-p4-projects@FreeBSD.ORG  Sat Aug 18 15:53:50 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 64D8B16A469; Sat, 18 Aug 2007 15:53:50 +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 1F85916A420
	for <perforce@FreeBSD.org>; Sat, 18 Aug 2007 15:53:50 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 099FD13C494
	for <perforce@FreeBSD.org>; Sat, 18 Aug 2007 15:53:50 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7IFrnwh043244
	for <perforce@FreeBSD.org>; Sat, 18 Aug 2007 15:53:49 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7IFrnHx043241
	for perforce@freebsd.org; Sat, 18 Aug 2007 15:53:49 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Sat, 18 Aug 2007 15:53:49 GMT
Message-Id: <200708181553.l7IFrnHx043241@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 125305 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: Sat, 18 Aug 2007 15:53:50 -0000

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

Change 125305 by gonzo@gonzo_jeeves on 2007/08/18 15:53:14

	o Make admsw function as interrupt filter

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips32/adm5120/if_admsw.c#2 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips32/adm5120/if_admsw.c#2 (text+ko) ====

@@ -147,7 +147,7 @@
 static int	admsw_mediachange(struct ifnet *);
 static void	admsw_mediastatus(struct ifnet *, struct ifmediareq *);
 
-static void	admsw_intr(void *);
+static int	admsw_intr(void *);
 
 /* bus entry points */
 static int	admsw_probe(device_t dev);
@@ -415,8 +415,8 @@
                 return (ENXIO);
         }
 
-	if ((error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET, NULL, 
-	    admsw_intr, sc, &sc->sc_ih)) != 0) {
+	if ((error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET, 
+	    admsw_intr, NULL, sc, &sc->sc_ih)) != 0) {
                 device_printf(dev, 
                     "WARNING: unable to register interrupt handler\n");
                 return (error);
@@ -847,7 +847,7 @@
  *
  *	Interrupt service routine.
  */
-static void
+static int
 admsw_intr(void *arg)
 {
 	struct admsw_softc *sc = arg;
@@ -857,7 +857,7 @@
 	REG_WRITE(ADMSW_INT_ST, pending);
 
 	if (sc->ndevs == 0)
-		return;
+		return (FILTER_STRAY);
 
 	if ((pending & ADMSW_INTR_RHD) != 0)
 		admsw_rxintr(sc, 1);
@@ -871,6 +871,7 @@
 	if ((pending & ADMSW_INTR_SLD) != 0)
 		admsw_txintr(sc, 0);
 
+	return (FILTER_HANDLED);
 }
 
 /*