summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2004-07-07 19:19:38 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2004-07-07 19:19:38 +0000
commitbf1453ff1dd2892bf7abbd2fcb55224b03c48a71 (patch)
tree81f97512f947d846120167f17f6c62c4d6e14990
parent8d9f5ecf4a86447e7816c3fd1496210810afe1e5 (diff)
Only drain the transmit queue if we are idling the transmit section.
From NetBSD (dyoung)
-rw-r--r--sys/dev/ic/atw.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/ic/atw.c b/sys/dev/ic/atw.c
index 63797f5f756..05d546564c6 100644
--- a/sys/dev/ic/atw.c
+++ b/sys/dev/ic/atw.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: atw.c,v 1.4 2004/07/07 19:18:35 millert Exp $ */
-/* $NetBSD: atw.c,v 1.36 2004/06/23 09:27:59 dyoung Exp $ */
+/* $OpenBSD: atw.c,v 1.5 2004/07/07 19:19:37 millert Exp $ */
+/* $NetBSD: atw.c,v 1.37 2004/06/23 09:41:54 dyoung Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
#include <sys/cdefs.h>
#if defined(__NetBSD__)
-__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.36 2004/06/23 09:27:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.37 2004/06/23 09:41:54 dyoung Exp $");
#endif
#include "bpfilter.h"
@@ -2891,7 +2891,8 @@ atw_idle(struct atw_softc *sc, u_int32_t bits)
sc->sc_dev.dv_xname, bits, test0, stsr));
}
out:
- atw_txdrain(sc);
+ if ((bits & ATW_NAR_ST) != 0)
+ atw_txdrain(sc);
splx(s);
return;
}