summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkj <markj@FreeBSD.org>2018-03-28 14:01:26 +0000
committermarkj <markj@FreeBSD.org>2018-03-28 14:01:26 +0000
commitef8cf2c9443a335ddb2687bf25944d75a92db6c4 (patch)
treedb9d8ae9726811fda76e300b83d78ad79adce8eb
parenta49b767ec00701e78a120c8d4dcf2c4f07ca9946 (diff)
downloadFreeBSD-src-ef8cf2c9443a335ddb2687bf25944d75a92db6c4.zip
FreeBSD-src-ef8cf2c9443a335ddb2687bf25944d75a92db6c4.tar.gz
MFC r331538:
Clamp IFLIB_RX_COPY_THRESH to MHLEN in iflib_rxd_pkt_get().
-rw-r--r--sys/net/iflib.c2
1 files changed, 1 insertions, 1 deletions
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;
OpenPOWER on IntegriCloud