diff options
| author | augustss <augustss@NetBSD.org> | 2004-10-24 12:53:26 +0000 |
|---|---|---|
| committer | augustss <augustss@NetBSD.org> | 2004-10-24 12:53:26 +0000 |
| commit | f8968198b1fda06cbce9474c64e865597786a45f (patch) | |
| tree | 01ccfb78858f33d3dde0aa49df8cbf22b25a7067 /sys/dev | |
| parent | 122fe5d16ef9cf5421fd0970352376e5950e7dc0 (diff) | |
Dont use lockmgr() from interrupt context.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/if_axe.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c index eef5c0360a1..a4f31306e2d 100644 --- a/sys/dev/usb/if_axe.c +++ b/sys/dev/usb/if_axe.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_axe.c,v 1.3 2004/10/24 08:49:13 augustss Exp $ */ +/* $NetBSD: if_axe.c,v 1.4 2004/10/24 12:53:26 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000-2003 @@ -72,7 +72,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.3 2004/10/24 08:49:13 augustss Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.4 2004/10/24 12:53:26 augustss Exp $"); #if defined(__NetBSD__) #include "opt_inet.h" @@ -1275,29 +1275,32 @@ axe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) return(error); } +/* + * XXX + * You can't call axe_txeof since the USB transfer has not + * completed yet. + */ Static void axe_watchdog(struct ifnet *ifp) { struct axe_softc *sc; struct axe_chain *c; usbd_status stat; + int s; sc = ifp->if_softc; - axe_lock_mii(sc); ifp->if_oerrors++; printf("%s: watchdog timeout\n", USBDEVNAME(sc->axe_dev)); + s = splusb(); c = &sc->axe_cdata.axe_tx_chain[0]; usbd_get_xfer_status(c->axe_xfer, NULL, NULL, NULL, &stat); axe_txeof(c->axe_xfer, c, stat); - axe_unlock_mii(sc); - if (ifp->if_snd.ifq_head != NULL) axe_start(ifp); - - return; + splx(s); } /* |
