diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-11-20 14:32:34 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-11-20 14:32:34 +0000 |
| commit | ef182b535200cab876d75c98a1f687bee3b30b18 (patch) | |
| tree | f028d5ff74b260f27bc7aa3e7a60ca08ce68a2a6 | |
| parent | d7acef020645a562758e1101f4e56a95957cff06 (diff) | |
Missed in previous, pointed by benoit@
| -rw-r--r-- | sys/dev/pci/if_em.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/pci/if_em.h b/sys/dev/pci/if_em.h index fa8d440f305..f228cb64e52 100644 --- a/sys/dev/pci/if_em.h +++ b/sys/dev/pci/if_em.h @@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ /* $FreeBSD: if_em.h,v 1.26 2004/09/01 23:22:41 pdeuskar Exp $ */ -/* $OpenBSD: if_em.h,v 1.59 2015/11/14 17:54:57 mpi Exp $ */ +/* $OpenBSD: if_em.h,v 1.60 2015/11/20 14:32:33 mpi Exp $ */ #ifndef _EM_H_DEFINED_ #define _EM_H_DEFINED_ @@ -182,9 +182,10 @@ typedef int boolean_t; #define EM_TX_TIMEOUT 5 /* set to 5 seconds */ /* - * Thise parameter controls the minimum number of available transmit - * descriptors needed before we attempt transmission of a packet. + * These parameters control when the driver calls the routine to reclaim + * transmit descriptors. */ +#define EM_TX_CLEANUP_THRESHOLD (sc->num_tx_desc / 8) #define EM_TX_OP_THRESHOLD (sc->num_tx_desc / 32) /* @@ -350,8 +351,8 @@ struct em_softc { struct em_tx_desc *tx_desc_base; u_int32_t next_avail_tx_desc; u_int32_t next_tx_to_clean; - volatile u_int32_t num_tx_desc_avail; - u_int32_t num_tx_desc; + volatile u_int16_t num_tx_desc_avail; + u_int16_t num_tx_desc; u_int32_t txd_cmd; struct em_buffer *tx_buffer_area; bus_dma_tag_t txtag; /* dma tag for tx */ |