Date: Mon, 3 Jul 2006 10:56:26 GMT From: Paolo Pisati <piso@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 100487 for review Message-ID: <200607031056.k63AuQID071729@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607031056.k63AuQID071729>