Module Name: src
Committed By: tsutsui
Date: Sun Apr 11 09:58:36 UTC 2010
Modified Files:
src/sys/dev/ic: dp8390.c
Log Message:
Fix botched logic in ipkdb part in rev 1.77 (KNF misc).
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/ic/dp8390.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/dp8390.c
diff -u src/sys/dev/ic/dp8390.c:1.78 src/sys/dev/ic/dp8390.c:1.79
--- src/sys/dev/ic/dp8390.c:1.78 Mon Apr 5 07:19:34 2010
+++ src/sys/dev/ic/dp8390.c Sun Apr 11 09:58:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dp8390.c,v 1.78 2010/04/05 07:19:34 joerg Exp $ */
+/* $NetBSD: dp8390.c,v 1.79 2010/04/11 09:58:36 tsutsui Exp $ */
/*
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@@ -14,7 +14,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.78 2010/04/05 07:19:34 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.79 2010/04/11 09:58:36 tsutsui Exp $");
#include "opt_ipkdb.h"
#include "opt_inet.h"
@@ -1392,7 +1392,7 @@
/* If output active, wait for packets to drain */
while (sc->txb_inuse) {
while ((cmd = (NIC_GET(regt, regh, ED_P0_ISR) &
- (ED_ISR_PTX | ED_ISR_TXE))) != 0)
+ (ED_ISR_PTX | ED_ISR_TXE))) == 0)
DELAY(1);
NIC_PUT(regt, regh, ED_P0_ISR, cmd);
if (--sc->txb_inuse)
@@ -1522,7 +1522,7 @@
dp8390_xmit(sc);
while ((NIC_GET(regt, regh, ED_P0_ISR) &
- (ED_ISR_PTX | ED_ISR_TXE)) != 0)
+ (ED_ISR_PTX | ED_ISR_TXE)) == 0)
DELAY(1);
sc->txb_inuse--;
