From owner-p4-projects@FreeBSD.ORG  Sat Mar  3 17:23:29 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 A711716A408; Sat,  3 Mar 2007 17:23:29 +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 7AFD016A401
	for <perforce@freebsd.org>; Sat,  3 Mar 2007 17:23:29 +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 6FA8813C4A7
	for <perforce@freebsd.org>; Sat,  3 Mar 2007 17:23:29 +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 l23HNTch037526
	for <perforce@freebsd.org>; Sat, 3 Mar 2007 17:23:29 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l23HNT8D037516
	for perforce@freebsd.org; Sat, 3 Mar 2007 17:23:29 GMT
	(envelope-from piso@freebsd.org)
Date: Sat, 3 Mar 2007 17:23:29 GMT
Message-Id: <200703031723.l23HNT8D037516@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 115282 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, 03 Mar 2007 17:23:30 -0000

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

Change 115282 by piso@piso_newluxor on 2007/03/03 17:22:44

	Restore filtered handler for re.

Affected files ...

.. //depot/projects/soc2006/intr_filter/dev/re/if_re.c#18 edit

Differences ...

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

@@ -241,10 +241,10 @@
 static void re_poll		(struct ifnet *, enum poll_cmd, int);
 static void re_poll_locked	(struct ifnet *, enum poll_cmd, int);
 #endif
-static int re_intr		(void *);
 static void re_tick		(void *);
 static void re_tx_task		(void *, int);
 static void re_int_task		(void *);
+static int re_filter		(void *);
 static void re_start		(struct ifnet *);
 static int re_ioctl		(struct ifnet *, u_long, caddr_t);
 static void re_init		(void *);
@@ -1364,7 +1364,6 @@
 		re_stop(sc);
 		RL_UNLOCK(sc);
 		callout_drain(&sc->rl_stat_callout);
-		taskqueue_drain(taskqueue_fast, &sc->rl_inttask);
 		taskqueue_drain(taskqueue_fast, &sc->rl_txtask);
 		/*
 		 * Force off the IFF_UP flag here, in case someone
@@ -1938,7 +1937,7 @@
                 return (FILTER_STRAY);
 	CSR_WRITE_2(sc, RL_IMR, 0);
 
-	return(FILTER_HANDLED | FILTER_SCHEDULE_THREAD);
+	return (FILTER_HANDLED | FILTER_SCHEDULE_THREAD);
 }
 
 static void