diff options
author | Sean Bruno <sbruno@FreeBSD.org> | 2017-01-24 15:55:52 +0000 |
---|---|---|
committer | Sean Bruno <sbruno@FreeBSD.org> | 2017-01-24 15:55:52 +0000 |
commit | 36fa5d5b645727132c69620eba752aaf975e2982 (patch) | |
tree | a00983a672d1be4033d50cb1e45dcd09192a1c7c /sys/dev/e1000 | |
parent | 562a3182f6e4aad86dddad30d10a9ac902db923c (diff) | |
download | src-36fa5d5b645727132c69620eba752aaf975e2982.tar.gz src-36fa5d5b645727132c69620eba752aaf975e2982.zip |
Revert 312696 due to build tests.
Notes
Notes:
svn path=/head/; revision=312697
Diffstat (limited to 'sys/dev/e1000')
-rw-r--r-- | sys/dev/e1000/em_txrx.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index 96bc7d2dc4bc..33a9b9d115f4 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -408,13 +408,10 @@ em_isc_txd_credits_update(void *arg, uint16_t txqid, uint32_t cidx_init, bool cl cidx = cidx_init; buf = &txr->tx_buffers[cidx]; tx_desc = &txr->tx_base[cidx]; - last = buf->eop; - if (last == -1) - return (processed); + last = buf->eop; eop_desc = &txr->tx_base[last]; - DPRINTF(iflib_get_dev(adapter->ctx), - "credits_update: cidx_init=%d clear=%d last=%d\n", + DPRINTF(iflib_get_dev(adapter->ctx), "credits_update: cidx_init=%d clear=%d last=%d\n", cidx_init, clear, last); /* * What this does is get the index of the @@ -423,7 +420,7 @@ em_isc_txd_credits_update(void *arg, uint16_t txqid, uint32_t cidx_init, bool cl * simple comparison on the inner while loop. */ if (++last == scctx->isc_ntxd[0]) - last = 0; + last = 0; done = last; @@ -439,7 +436,7 @@ em_isc_txd_credits_update(void *arg, uint16_t txqid, uint32_t cidx_init, bool cl tx_desc++; buf++; processed++; - + /* wrap the ring ? */ if (++cidx == scctx->isc_ntxd[0]) { cidx = 0; |