D6705.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D6705.id.diff
View Options

	Index: head/sys/dev/sfxge/common/ef10_nic.c
	===================================================================
	--- head/sys/dev/sfxge/common/ef10_nic.c
	+++ head/sys/dev/sfxge/common/ef10_nic.c
	@@ -1003,8 +1003,11 @@
	encp->enc_rx_batching_enabled =
	CAP_FLAG(flags, RX_BATCHING) ? B_TRUE : B_FALSE;

	- if (encp->enc_rx_batching_enabled)
	- encp->enc_rx_batch_max = 16;
	+ /*
	+ * Even if batching isn't reported as supported, we may still get
	+ * batched events.
	+ */
	+ encp->enc_rx_batch_max = 16;

	/* Check if the firmware supports disabling scatter on RXQs */
	encp->enc_rx_disable_scatter_supported =
	Index: head/sys/dev/sfxge/sfxge_ev.c
	===================================================================
	--- head/sys/dev/sfxge/sfxge_ev.c
	+++ head/sys/dev/sfxge/sfxge_ev.c
	@@ -128,8 +128,7 @@
	rxq->pending += delta;

	if (delta != 1) {
	- if ((!efx_nic_cfg_get(sc->enp)->enc_rx_batching_enabled) \|\|
	- (delta <= 0) \|\|
	+ if ((delta <= 0) \|\|
	(delta > efx_nic_cfg_get(sc->enp)->enc_rx_batch_max)) {
	evq->exception = B_TRUE;