d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle watchdog timeouts better. We can't really call the foo_init()

Browse Source 
routines from foo_watchdog() because foo_watchdog() is called at
interrupt context, and that's a no-no due to the way the USB stack
is currently set up.

What we do now is call the TX end of frame handler manually to clear
the completed transmission, then check the send queue and send off
any frames that are pending.

Also turned off the interrupt pipe stuff in if_aue, since it appears
to tickle a bug in the USB stack that I haven't found yet.
This commit is contained in:
Bill Paul 2000-06-01 23:16:42 +00:00
parent d2c1dda326
commit a2693d6d71
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/usb/if_cue.c
View File

@ -812,9 +812,11 @@ Static void cue_txeof(xfer, priv, status)
ifp->if_flags &= ~IFF_OACTIVE;
usbd_get_xfer_status(c->cue_xfer, NULL, NULL, NULL, &err);
c->cue_mbuf->m_pkthdr.rcvif = ifp;
usb_tx_done(c->cue_mbuf);
c->cue_mbuf = NULL;
if (c->cue_mbuf != NULL) {
c->cue_mbuf->m_pkthdr.rcvif = ifp;
usb_tx_done(c->cue_mbuf);
c->cue_mbuf = NULL;
}
if (err)
ifp->if_oerrors++;
@ -1094,13 +1096,17 @@ Static void cue_watchdog(ifp)
struct ifnet *ifp;
{
struct cue_softc *sc;
struct cue_chain *c;
usbd_status stat;
sc = ifp->if_softc;
ifp->if_oerrors++;
printf("cue%d: watchdog timeout\n", sc->cue_unit);
cue_init(sc);
c = &sc->cue_cdata.cue_tx_chain[0];
usbd_get_xfer_status(c->cue_xfer, NULL, NULL, NULL, &stat);
cue_txeof(c->cue_xfer, c, stat);
if (ifp->if_snd.ifq_head != NULL)
cue_start(ifp);

14
sys/dev/usb/if_kue.c
View File

@ -763,9 +763,11 @@ Static void kue_txeof(xfer, priv, status)
usbd_get_xfer_status(c->kue_xfer, NULL, NULL, NULL, &err);
c->kue_mbuf->m_pkthdr.rcvif = ifp;
usb_tx_done(c->kue_mbuf);
c->kue_mbuf = NULL;
if (c->kue_mbuf != NULL) {
c->kue_mbuf->m_pkthdr.rcvif = ifp;
usb_tx_done(c->kue_mbuf);
c->kue_mbuf = NULL;
}
if (err)
ifp->if_oerrors++;
@ -1002,13 +1004,17 @@ Static void kue_watchdog(ifp)
struct ifnet *ifp;
{
struct kue_softc *sc;
struct kue_chain *c;
usbd_status stat;
sc = ifp->if_softc;
ifp->if_oerrors++;
printf("kue%d: watchdog timeout\n", sc->kue_unit);
kue_init(sc);
c = &sc->kue_cdata.kue_tx_chain[0];
usbd_get_xfer_status(c->kue_xfer, NULL, NULL, NULL, &stat);
kue_txeof(c->kue_xfer, c, stat);
if (ifp->if_snd.ifq_head != NULL)
kue_start(ifp);