diff options
| author |   dlg <dlg@openbsd.org> | 2009-08-12 20:02:42 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2009-08-12 20:02:42 +0000 |
| commit | 1f5b91144e18d1a1bda4a89b8b9145d4a0463274 (patch) | |
| tree | e41d24eb1768f85ac177c523f819b7af3989a47e /sys/dev/pci/if_em.c | |
| parent | Crank the /usr sizes in the large configuration (diff) | |
| download | wireguard-openbsd-1f5b91144e18d1a1bda4a89b8b9145d4a0463274.tar.xz wireguard-openbsd-1f5b91144e18d1a1bda4a89b8b9145d4a0463274.zip | |
revert my change to m_cluncount which tries to prevent the system
running out of mbufs for rx rings.
if the system low watermark is lower than a rx rings low watermark,
we'll never send a packet up the stack, we'll always recycle it.
found by thib@ on a bge
sadface
Diffstat (limited to 'sys/dev/pci/if_em.c')
| -rw-r--r-- | sys/dev/pci/if_em.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index 9d7ef0b9f13..c15a6be13b7 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_em.c,v 1.218 2009/08/12 14:39:05 dlg Exp $ */ +/* $OpenBSD: if_em.c,v 1.219 2009/08/12 20:02:42 dlg Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -2649,12 +2649,10 @@ em_rxeof(struct em_softc *sc, int count) sc->last_rx_desc_filled); } + m_cluncount(m, 1); sc->rx_ndescs--; - if (m_cluncount(m) == 0) - accept_frame = 1; - else - accept_frame = 0; + accept_frame = 1; prev_len_adj = 0; desc_len = letoh16(desc->length); |