Date: Fri, 6 Jun 2008 16:09:07 GMT From: Paolo Pisati <piso@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 143034 for review Message-ID: <200806061609.m56G97VL047242@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=143034 Change 143034 by piso@piso_ferret on 2008/06/06 16:09:02 fix compilation of ie. Affected files ... .. //depot/projects/soc2005/libalias/sys/dev/ie/if_ie.c#5 edit .. //depot/projects/soc2005/libalias/sys/dev/ie/if_ie507.h#2 edit .. //depot/projects/soc2005/libalias/sys/dev/ie/if_ie_isa.c#6 edit .. //depot/projects/soc2005/libalias/sys/dev/ie/if_iee16.h#2 edit .. //depot/projects/soc2005/libalias/sys/dev/ie/if_iereg.h#2 edit .. //depot/projects/soc2005/libalias/sys/dev/ie/if_ievar.h#4 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/dev/ie/if_ie.c#5 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ie/if_ie.c,v 1.110 2008/06/05 14:43:55 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ie/if_ie.c,v 1.106 2005/11/11 16:04:52 ru Exp $"); /* * Intel 82586 Ethernet chip @@ -319,7 +319,7 @@ ifp->if_start = iestart; ifp->if_ioctl = ieioctl; ifp->if_init = ieinit; - IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); + ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; if (sc->hard_type == IE_EE16) EVENTHANDLER_REGISTER(shutdown_post_sync, ee16_shutdown, @@ -1639,12 +1639,12 @@ (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { sc->promisc = ifp->if_flags & (IFF_PROMISC | IFF_ALLMULTI); - ieinit_locked(sc); + ieinit(sc); } else if (sc->promisc ^ (ifp->if_flags & (IFF_PROMISC | IFF_ALLMULTI))) { sc->promisc = ifp->if_flags & (IFF_PROMISC | IFF_ALLMULTI); - ieinit_locked(sc); + ieinit(sc); } break; ==== //depot/projects/soc2005/libalias/sys/dev/ie/if_ie507.h#2 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/dev/ie/if_ie_isa.c#6 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ie/if_ie_isa.c,v 1.9 2008/06/05 14:45:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ie/if_ie_isa.c,v 1.7 2007/02/23 12:18:43 piso Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -823,13 +823,11 @@ DEVMETHOD(device_detach, ie_detach), { 0, 0 } }; - static driver_t ie_isa_3C507_driver = { "ie", ie_isa_3C507_methods, sizeof(struct ie_softc), }; - DRIVER_MODULE(ie_3C507, isa, ie_isa_3C507_driver, ie_devclass, ie_modevent, 0); MODULE_DEPEND(ie_3C507, elink, 1, 1, 1); @@ -840,14 +838,12 @@ DEVMETHOD(device_detach, ie_detach), { 0, 0 } }; - static driver_t ie_isa_ee16_driver = { "ie", ie_isa_ee16_methods, sizeof(struct ie_softc), }; - -DRIVER_MODULE(ie, isa, ie_isa_ee16_driver, ie_devclass, ie_modevent, 0); +DRIVER_MODULE(ie_EE16, isa, ie_isa_ee16_driver, ie_devclass, ie_modevent, 0); static device_method_t ie_isa_sl_methods[] = { DEVMETHOD(device_probe, ie_isa_sl_probe), @@ -855,13 +851,11 @@ DEVMETHOD(device_detach, ie_detach), { 0, 0 } }; - static driver_t ie_isa_sl_driver = { "ie", ie_isa_sl_methods, sizeof(struct ie_softc), }; - DRIVER_MODULE(ie_SL, isa, ie_isa_sl_driver, ie_devclass, ie_modevent, 0); static int ==== //depot/projects/soc2005/libalias/sys/dev/ie/if_iee16.h#2 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/dev/ie/if_iereg.h#2 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/dev/ie/if_ievar.h#4 (text+ko) ====
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200806061609.m56G97VL047242>