diff options
| author | marius <marius@FreeBSD.org> | 2006-12-08 03:18:16 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2006-12-08 03:18:16 +0000 |
| commit | 0063ea93ffb54fe86c9462905d46cf8fc4cb667a (patch) | |
| tree | 944000ef8a6c459e3347f6ff1840a2f09a86fa37 /sys/pci | |
| parent | 7069570fccb71ba67f3b1973c6a6c2b1d387a026 (diff) | |
| download | FreeBSD-src-0063ea93ffb54fe86c9462905d46cf8fc4cb667a.zip FreeBSD-src-0063ea93ffb54fe86c9462905d46cf8fc4cb667a.tar.gz | |
- Revert the parts of the previous revision which reloaded the watchdog
timer in xl_txeof()/xl_txeof_90xB(); xl_poll_locked() unconditionally
invokes xl_txeof()/xl_txeof_90xB(), effectively circumventing that
the watchdog ever fires in the DEVICE_POLLING case as its timer is
constantly reloaded.
- Remove the banal and pedantically outdated comment regarding setting
xl_wdog_timer to 0 in xl_txeof().
Pointed out by: bde
Diffstat (limited to 'sys/pci')
| -rw-r--r-- | sys/pci/if_xl.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c index a5ac0eb..e470f7a 100644 --- a/sys/pci/if_xl.c +++ b/sys/pci/if_xl.c @@ -2151,7 +2151,6 @@ xl_txeof(struct xl_softc *sc) if (sc->xl_cdata.xl_tx_head == NULL) { ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - /* Clear the timeout timer. */ sc->xl_wdog_timer = 0; sc->xl_cdata.xl_tx_tail = NULL; } else { @@ -2160,7 +2159,6 @@ xl_txeof(struct xl_softc *sc) CSR_WRITE_4(sc, XL_DOWNLIST_PTR, sc->xl_cdata.xl_tx_head->xl_phys); CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_DOWN_UNSTALL); - sc->xl_wdog_timer = 5; } } } @@ -2199,7 +2197,8 @@ xl_txeof_90xB(struct xl_softc *sc) XL_INC(idx, XL_TX_LIST_CNT); } - sc->xl_wdog_timer = sc->xl_cdata.xl_tx_cnt == 0 ? 0 : 5; + if (sc->xl_cdata.xl_tx_cnt == 0) + sc->xl_wdog_timer = 0; sc->xl_cdata.xl_tx_cons = idx; if (cur_tx != NULL) |
