diff options
| author |   brad <brad@openbsd.org> | 2006-02-10 09:12:25 +0000 |
|---|---|---|
| committer | brad <brad@openbsd.org> | 2006-02-10 09:12:25 +0000 |
| commit | 4f09b6f0fc28c1ac3c5d9361ae47874d40d9234c (patch) | |
| tree | b7774693f1cbcd08ad262b57aca3cb783bbde217 | |
| parent | remove unnecessary link state check in the watchdog handler. (diff) | |
| download | wireguard-openbsd-4f09b6f0fc28c1ac3c5d9361ae47874d40d9234c.tar.xz wireguard-openbsd-4f09b6f0fc28c1ac3c5d9361ae47874d40d9234c.zip | |
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
| -rw-r--r-- | sys/dev/pci/if_em.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_ixgb.c | 4 |
2 files changed, 4 insertions, 4 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; diff --git a/sys/dev/pci/if_ixgb.c b/sys/dev/pci/if_ixgb.c index 39ed7422490..6a0c28533bb 100644 --- a/sys/dev/pci/if_ixgb.c +++ b/sys/dev/pci/if_ixgb.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_ixgb.c,v 1.7 2006/02/10 08:56:14 brad Exp $ */ +/* $OpenBSD: if_ixgb.c,v 1.8 2006/02/10 09:12:26 brad Exp $ */ #include <dev/pci/if_ixgb.h> @@ -1394,7 +1394,7 @@ ixgb_clean_transmit_interrupts(struct ixgb_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 = IXGB_TX_TIMEOUT; } sc->num_tx_desc_avail = num_avail; |