summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2004-12-05 04:51:48 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2004-12-05 04:51:48 +0000
commit85f2918fc10e4a3d4a759dd959328cc31800396c (patch)
tree09f1e58202416a15ebb86e8026b5b792e0481127 /sys
parent8b4504b92bda88cd6493438dad5418867e2d38e9 (diff)
net80211 in the watchdog
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/usb/if_atu.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c
index 28b33858a70..3a5cc051b41 100644
--- a/sys/dev/usb/if_atu.c
+++ b/sys/dev/usb/if_atu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_atu.c,v 1.36 2004/12/05 03:04:44 dlg Exp $ */
+/* $OpenBSD: if_atu.c,v 1.37 2004/12/05 04:51:47 dlg Exp $ */
/*
* Copyright (c) 2003, 2004
* Daan Vreeken <Danovitsch@Vitsch.net>. All rights reserved.
@@ -2233,11 +2233,18 @@ atu_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
void
atu_watchdog(struct ifnet *ifp)
{
- struct atu_softc *sc;
+ struct atu_softc *sc = ifp->if_softc;
struct atu_chain *c;
usbd_status stat;
int cnt, s;
+ DPRINTF(("%s: atu_watchdog\n", USBDEVNAME(sc->atu_dev)));
+
+ ifp->if_timer = 0;
+
+ if (sc->atu_dying)
+ return;
+
sc = ifp->if_softc;
s = splnet();
ifp->if_oerrors++;
@@ -2259,6 +2266,8 @@ atu_watchdog(struct ifnet *ifp)
if (ifp->if_snd.ifq_head != NULL)
atu_start(ifp);
splx(s);
+
+ ieee80211_watchdog(ifp);
}
/*