summaryrefslogtreecommitdiff
path: root/sys/dev/pci/if_em.c
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-02-10 09:12:27 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-02-10 09:12:27 +0000
commit234a8c31c621d04d3fd041c976d84ae93edcca96 (patch)
treede2567eab62be0c88f2b78e733ec0cd10a3abd81 /sys/dev/pci/if_em.c
parent08cbea94c861b51fb0b6ce5d7572fa27a8d7bb71 (diff)
fix a typo in em_clean_transmit_interrupts() that will cause the
watchdog timer to fire if the TX descriptor ring is emptied for EM_TX_TIMEOUT seconds. The same bug exists in ixgb(4) too. From FreeSBD
Diffstat (limited to 'sys/dev/pci/if_em.c')
-rw-r--r--sys/dev/pci/if_em.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index b340492ffbf..98a2d0d53cc 100644
--- a/sys/dev/pci/if_em.c
+++ b/sys/dev/pci/if_em.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
-/* $OpenBSD: if_em.c,v 1.103 2006/02/10 08:58:06 brad Exp $ */
+/* $OpenBSD: if_em.c,v 1.104 2006/02/10 09:12:25 brad Exp $ */
/* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
#include <dev/pci/if_em.h>
@@ -1979,7 +1979,7 @@ em_clean_transmit_interrupts(struct em_softc *sc)
ifp->if_flags &= ~IFF_OACTIVE;
if (num_avail == sc->num_tx_desc)
ifp->if_timer = 0;
- else if (num_avail == sc->num_tx_desc_avail)
+ else if (num_avail != sc->num_tx_desc_avail)
ifp->if_timer = EM_TX_TIMEOUT;
}
sc->num_tx_desc_avail = num_avail;