diff options
| author | Christian Brueffer <brueffer@FreeBSD.org> | 2007-05-01 11:17:29 +0000 |
|---|---|---|
| committer | Christian Brueffer <brueffer@FreeBSD.org> | 2007-05-01 11:17:29 +0000 |
| commit | 8d2896ac910beee59b2b4780871d80a9b7206188 (patch) | |
| tree | cdf3fa7354e471bdfaf8cba33aa3c7ad48bc9060 /sys/dev/usb | |
| parent | 0eedd05b1903546a185d96e978c055df29012cd9 (diff) | |
Notes
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/if_axe.c | 23 | ||||
| -rw-r--r-- | sys/dev/usb/if_axereg.h | 2 |
2 files changed, 0 insertions, 25 deletions
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c index ce33ed0ddb4b..a352ce78aa04 100644 --- a/sys/dev/usb/if_axe.c +++ b/sys/dev/usb/if_axe.c @@ -89,9 +89,6 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <machine/bus.h> -#if __FreeBSD_version < 500000 -#include <machine/clock.h> -#endif #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> @@ -345,11 +342,7 @@ axe_setmulti(struct axe_softc *sc) rxmode &= ~AXE_RXCMD_ALLMULTI; IF_ADDR_LOCK(ifp); -#if __FreeBSD_version >= 500000 TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) -#else - LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) -#endif { if (ifma->ifma_addr->sa_family != AF_LINK) continue; @@ -467,10 +460,8 @@ USB_ATTACH(axe) } } -#if __FreeBSD_version >= 500000 mtx_init(&sc->axe_mtx, device_get_nameunit(self), MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); -#endif sx_init(&sc->axe_sleeplock, device_get_nameunit(self)); AXE_SLEEPLOCK(sc); AXE_LOCK(sc); @@ -498,9 +489,7 @@ USB_ATTACH(axe) AXE_UNLOCK(sc); AXE_SLEEPUNLOCK(sc); sx_destroy(&sc->axe_sleeplock); -#if __FreeBSD_version >= 500000 mtx_destroy(&sc->axe_mtx); -#endif USB_ATTACH_ERROR_RETURN; } ifp->if_softc = sc; @@ -524,9 +513,7 @@ USB_ATTACH(axe) AXE_UNLOCK(sc); AXE_SLEEPUNLOCK(sc); sx_destroy(&sc->axe_sleeplock); -#if __FreeBSD_version >= 500000 mtx_destroy(&sc->axe_mtx); -#endif USB_ATTACH_ERROR_RETURN; } @@ -534,11 +521,7 @@ USB_ATTACH(axe) * Call MI attach routine. */ -#if __FreeBSD_version >= 500000 ether_ifattach(ifp, eaddr); -#else - ether_ifattach(ifp, ETHER_BPF_SUPPORTED); -#endif callout_handle_init(&sc->axe_stat_ch); usb_register_netisr(); @@ -564,12 +547,8 @@ axe_detach(device_t dev) untimeout(axe_tick, sc, sc->axe_stat_ch); usb_rem_task(sc->axe_udev, &sc->axe_tick_task); -#if __FreeBSD_version >= 500000 ether_ifdetach(ifp); if_free(ifp); -#else - ether_ifdetach(ifp, ETHER_BPF_SUPPORTED); -#endif if (sc->axe_ep[AXE_ENDPT_TX] != NULL) usbd_abort_pipe(sc->axe_ep[AXE_ENDPT_TX]); @@ -580,9 +559,7 @@ axe_detach(device_t dev) AXE_UNLOCK(sc); sx_destroy(&sc->axe_sleeplock); -#if __FreeBSD_version >= 500000 mtx_destroy(&sc->axe_mtx); -#endif return(0); } diff --git a/sys/dev/usb/if_axereg.h b/sys/dev/usb/if_axereg.h index daaca88349b3..3971c91ca9e6 100644 --- a/sys/dev/usb/if_axereg.h +++ b/sys/dev/usb/if_axereg.h @@ -138,9 +138,7 @@ struct axe_softc { int axe_if_flags; struct ue_cdata axe_cdata; struct callout_handle axe_stat_ch; -#if __FreeBSD_version >= 500000 struct mtx axe_mtx; -#endif struct sx axe_sleeplock; char axe_dying; int axe_link; |