D19199.id53929.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D19199.id53929.diff
View Options

	Index: sys/dev/e1000/if_em.c
	===================================================================
	--- sys/dev/e1000/if_em.c
	+++ sys/dev/e1000/if_em.c
	@@ -1276,15 +1276,8 @@
	*/
	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
	em_initialize_receive_unit(ctx);

	/* Use real VLAN Filter support? */
	Index: sys/net/iflib.c
	===================================================================
	--- sys/net/iflib.c
	+++ sys/net/iflib.c
	@@ -2175,17 +2175,8 @@
	*/
	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);