Date: Wed, 15 Jun 2005 20:58:52 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 78583 for review Message-ID: <200506152058.j5FKwqgO038878@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=78583 Change 78583 by jhb@jhb_slimer on 2005/06/15 20:58:09 IFC @78573. Affected files ... .. //depot/projects/smpng/sys/dev/ed/if_ed.c#31 integrate Differences ... ==== //depot/projects/smpng/sys/dev/ed/if_ed.c#31 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.253 2005/06/10 16:49:06 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.254 2005/06/15 20:23:40 brooks Exp $"); /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet @@ -616,7 +616,7 @@ static __inline void ed_xmit(struct ed_softc *sc) { - struct ifnet *ifp = (struct ifnet *)sc; + struct ifnet *ifp = sc->ifp; unsigned short len; if (sc->gone) @@ -964,7 +964,7 @@ edintr(void *arg) { struct ed_softc *sc = (struct ed_softc*) arg; - struct ifnet *ifp = (struct ifnet *)sc; + struct ifnet *ifp = sc->ifp; u_char isr; int count; @@ -1479,7 +1479,7 @@ static u_short ed_pio_write_mbufs(struct ed_softc *sc, struct mbuf *m, long dst) { - struct ifnet *ifp = (struct ifnet *)sc; + struct ifnet *ifp = sc->ifp; unsigned short total_len, dma_len; struct mbuf *mp; int maxwait = 200; /* about 240us */ @@ -1691,7 +1691,7 @@ static void ed_setrcr(struct ed_softc *sc) { - struct ifnet *ifp = (struct ifnet *)sc; + struct ifnet *ifp = sc->ifp; int i; u_char reg1;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200506152058.j5FKwqgO038878>