PERFORCE change 115282 for review

[Paolo Pisati]

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

Change 115282 by piso at 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