1
- /* $OpenBSD: if_ice.c,v 1.47 2025/06/19 09:05:03 stsp Exp $ */
1
+ /* $OpenBSD: if_ice.c,v 1.48 2025/06/20 09:27:49 stsp Exp $ */
2
2
3
3
/* Copyright (c) 2024, Intel Corporation
4
4
* All rights reserved.
@@ -29110,7 +29110,7 @@ ice_txeof(struct ice_softc *sc, struct ice_tx_queue *txq)
29110
29110
struct ice_tx_desc *ring, *txd;
29111
29111
struct ice_tx_map *txm;
29112
29112
bus_dmamap_t map;
29113
- unsigned int cons, prod, last, free ;
29113
+ unsigned int cons, prod, last;
29114
29114
unsigned int mask;
29115
29115
uint64_t dtype;
29116
29116
int done = 0;
@@ -29121,11 +29121,6 @@ ice_txeof(struct ice_softc *sc, struct ice_tx_queue *txq)
29121
29121
if (cons == prod)
29122
29122
return (0);
29123
29123
29124
- free = cons;
29125
- if (free <= prod)
29126
- free += txq->desc_count;
29127
- free -= prod;
29128
-
29129
29124
bus_dmamap_sync(sc->sc_dmat, ICE_DMA_MAP(&txq->tx_desc_mem),
29130
29125
0, ICE_DMA_LEN(&txq->tx_desc_mem), BUS_DMASYNC_POSTREAD);
29131
29126
@@ -29167,15 +29162,6 @@ ice_txeof(struct ice_softc *sc, struct ice_tx_queue *txq)
29167
29162
29168
29163
if (ifq_is_oactive(ifq))
29169
29164
ifq_restart(ifq);
29170
- else if (free <= ICE_MIN_DESC_COUNT + 1) {
29171
- /* XXX sometimes ring was OACTIVE but is_oactive() is false */
29172
- free = cons;
29173
- if (free <= prod)
29174
- free += txq->desc_count;
29175
- free -= prod;
29176
- if (free > ICE_MIN_DESC_COUNT + 1)
29177
- ifq_restart(ifq);
29178
- }
29179
29165
29180
29166
return (done);
29181
29167
}
0 commit comments