From ef8cf2c9443a335ddb2687bf25944d75a92db6c4 Mon Sep 17 00:00:00 2001 From: markj Date: Wed, 28 Mar 2018 14:01:26 +0000 Subject: MFC r331538: Clamp IFLIB_RX_COPY_THRESH to MHLEN in iflib_rxd_pkt_get(). --- sys/net/iflib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 003baa3..a4d05be 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -2056,7 +2056,7 @@ iflib_rxd_pkt_get(iflib_rxq_t rxq, if_rxd_info_t ri) /* should I merge this back in now that the two paths are basically duplicated? */ if (ri->iri_nfrags == 1 && - ri->iri_frags[0].irf_len <= IFLIB_RX_COPY_THRESH) { + ri->iri_frags[0].irf_len <= MIN(IFLIB_RX_COPY_THRESH, MHLEN)) { sd = rxd_frag_to_sd(rxq, &ri->iri_frags[0], NULL, FALSE); m = sd->ifsd_m; sd->ifsd_m = NULL; -- cgit v1.1