svn commit: r347210 - in stable/11/sys: dev/e1000 net

[Eric Joyner]

Author: erj
Date: Mon May  6 20:48:27 2019
New Revision: 347210
URL: https://svnweb.freebsd.org/changeset/base/347210

Log:
  MFC r344817: Remove references to CONTIGMALLOC_WORKS in iflib and em
  
  Sponsored by:	Intel Corporation

Modified:
  stable/11/sys/dev/e1000/if_em.c
  stable/11/sys/net/iflib.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/e1000/if_em.c
==============================================================================
--- stable/11/sys/dev/e1000/if_em.c	Mon May  6 20:46:58 2019	(r347209)
+++ stable/11/sys/dev/e1000/if_em.c	Mon May  6 20:48:27 2019	(r347210)
@@ -1429,15 +1429,8 @@ em_init_locked(struct adapter *adapter)
 	*/
 	if (adapter->hw.mac.max_frame_size <= 2048)
 		adapter->rx_mbuf_sz = MCLBYTES;
-#ifndef CONTIGMALLOC_WORKS
        else
                adapter->rx_mbuf_sz = MJUMPAGESIZE;
-#else
-	else if (adapter->hw.mac.max_frame_size <= 4096)
-		adapter->rx_mbuf_sz = MJUMPAGESIZE;
-	else
-		adapter->rx_mbuf_sz = MJUM9BYTES;
-#endif
 
 	/* Prepare receive descriptors and buffers */
 	if (em_setup_receive_structures(adapter)) {

Modified: stable/11/sys/net/iflib.c
==============================================================================
--- stable/11/sys/net/iflib.c	Mon May  6 20:46:58 2019	(r347209)
+++ stable/11/sys/net/iflib.c	Mon May  6 20:48:27 2019	(r347210)
@@ -2048,17 +2048,8 @@ iflib_fl_setup(iflib_fl_t fl)
 	 */
 	if (sctx->isc_max_frame_size <= 2048)
 		fl->ifl_buf_size = MCLBYTES;
-#ifndef CONTIGMALLOC_WORKS
 	else
 		fl->ifl_buf_size = MJUMPAGESIZE;
-#else
-	else if (sctx->isc_max_frame_size <= 4096)
-		fl->ifl_buf_size = MJUMPAGESIZE;
-	else if (sctx->isc_max_frame_size <= 9216)
-		fl->ifl_buf_size = MJUM9BYTES;
-	else
-		fl->ifl_buf_size = MJUM16BYTES;
-#endif
 	if (fl->ifl_buf_size > ctx->ifc_max_fl_buf_size)
 		ctx->ifc_max_fl_buf_size = fl->ifl_buf_size;
 	fl->ifl_cltype = m_gettype(fl->ifl_buf_size);