diff options
author | David Gwynne <dlg@cvs.openbsd.org> | 2008-12-03 00:59:49 +0000 |
---|---|---|
committer | David Gwynne <dlg@cvs.openbsd.org> | 2008-12-03 00:59:49 +0000 |
commit | bbd1c0b82a400e1542c8c2d22c5da90dc8bf6cf4 (patch) | |
tree | b3bc5988a68f9d2f772e293840252685c47e4a2c /sys/dev/pci/if_em.h | |
parent | f975abdf986484b1106e54c85f3e4e16a373adc5 (diff) |
recommit the use of the new mbuf cluster allocator.
this starts em up with 4 mbufs on the rx ring, which will then grow as
usage demands. this also allows em to take advantage of the new livelock
mitigation code as well as freeing up a boatload of kernel memory.
this version of the diff makes sure we only ever post the last descriptor
we filled to the hardware, rather than the whole ring when bringing the
interface up. it has been tested by users who got panics with the previous
diff without trouble.
Diffstat (limited to 'sys/dev/pci/if_em.h')
-rw-r--r-- | sys/dev/pci/if_em.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/pci/if_em.h b/sys/dev/pci/if_em.h index fa38673ce60..c4906f42e4d 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.40 2008/11/29 10:23:29 sthen Exp $ */ +/* $OpenBSD: if_em.h,v 1.41 2008/12/03 00:59:48 dlg Exp $ */ #ifndef _EM_H_DEFINED_ #define _EM_H_DEFINED_ @@ -379,6 +379,8 @@ struct em_softc { struct em_dma_alloc rxdma; /* bus_dma glue for rx desc */ struct em_rx_desc *rx_desc_base; u_int32_t next_rx_desc_to_check; + u_int32_t last_rx_desc_filled; + int rx_ndescs; u_int32_t rx_buffer_len; u_int16_t num_rx_desc; struct em_buffer *rx_buffer_area; |