aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/usb/if_rue.c
diff options
context:
space:
mode:
authorChristian Brueffer <brueffer@FreeBSD.org>2007-05-12 05:53:53 +0000
committerChristian Brueffer <brueffer@FreeBSD.org>2007-05-12 05:53:53 +0000
commit224aecbcdf8667cf5bd8f6da540b68fb4cb7d5d3 (patch)
tree2ca1667191e5e475195c22112829ac1c8e875fba /sys/dev/usb/if_rue.c
parentac474f954532b7c6570bd4018f91922e5bd52f88 (diff)
Notes
Diffstat (limited to 'sys/dev/usb/if_rue.c')
-rw-r--r--sys/dev/usb/if_rue.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/sys/dev/usb/if_rue.c b/sys/dev/usb/if_rue.c
index 80e68157ec674..38a6907ccb116 100644
--- a/sys/dev/usb/if_rue.c
+++ b/sys/dev/usb/if_rue.c
@@ -86,9 +86,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>
@@ -502,11 +499,7 @@ rue_setmulti(struct rue_softc *sc)
/* now program new ones */
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;
@@ -651,10 +644,8 @@ USB_ATTACH(rue)
}
}
-#if __FreeBSD_version >= 500000
mtx_init(&sc->rue_mtx, device_get_nameunit(self), MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
-#endif
RUE_LOCK(sc);
/* Reset the adapter */
@@ -695,11 +686,7 @@ USB_ATTACH(rue)
sc->rue_qdat.if_rxstart = rue_rxstart;
/* Call MI attach routine */
-#if __FreeBSD_version >= 500000
ether_ifattach(ifp, eaddr);
-#else
- ether_ifattach(ifp, ETHER_BPF_SUPPORTED);
-#endif
callout_handle_init(&sc->rue_stat_ch);
usb_register_netisr();
sc->rue_dying = 0;
@@ -712,9 +699,7 @@ USB_ATTACH(rue)
if_free(ifp);
error1:
RUE_UNLOCK(sc);
-#if __FreeBSD_version >= 500000
mtx_destroy(&sc->rue_mtx);
-#endif
error:
free(devinfo, M_USBDEV);
USB_ATTACH_ERROR_RETURN;
@@ -732,12 +717,8 @@ rue_detach(device_t dev)
sc->rue_dying = 1;
untimeout(rue_tick, sc, sc->rue_stat_ch);
-#if __FreeBSD_version >= 500000
ether_ifdetach(ifp);
if_free(ifp);
-#else
- ether_ifdetach(ifp, ETHER_BPF_SUPPORTED);
-#endif
if (sc->rue_ep[RUE_ENDPT_TX] != NULL)
usbd_abort_pipe(sc->rue_ep[RUE_ENDPT_TX]);
@@ -749,9 +730,7 @@ rue_detach(device_t dev)
#endif
RUE_UNLOCK(sc);
-#if __FreeBSD_version >= 500000
mtx_destroy(&sc->rue_mtx);
-#endif
return (0);
}