D18099.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D18099.diff
View Options

	Index: head/sys/dev/sfxge/common/ef10_rx.c
	===================================================================
	--- head/sys/dev/sfxge/common/ef10_rx.c
	+++ head/sys/dev/sfxge/common/ef10_rx.c
	@@ -787,8 +787,7 @@
	{
	efx_nic_t *enp = erp->er_enp;
	efx_dword_t dword;
	- efx_evq_rxq_state_t *rxq_state =
	- &erp->er_eep->ee_rxq_state[erp->er_label];
	+ efx_evq_rxq_state_t *rxq_state = erp->er_ev_qstate;
	uint32_t credits;

	EFSYS_ASSERT(rxq_state->eers_rx_packed_stream);
	@@ -837,8 +836,7 @@
	uint16_t buf_len;
	uint8_t *pkt_start;
	efx_qword_t *qwordp;
	- efx_evq_rxq_state_t *rxq_state =
	- &erp->er_eep->ee_rxq_state[erp->er_label];
	+ efx_evq_rxq_state_t *rxq_state = erp->er_ev_qstate;

	EFSYS_ASSERT(rxq_state->eers_rx_packed_stream);

	@@ -996,6 +994,8 @@
	erp->er_label = label;

	ef10_ev_rxlabel_init(eep, erp, label, type);
	+
	+ erp->er_ev_qstate = &erp->er_eep->ee_rxq_state[label];

	return (0);

	Index: head/sys/dev/sfxge/common/efx_impl.h
	===================================================================
	--- head/sys/dev/sfxge/common/efx_impl.h
	+++ head/sys/dev/sfxge/common/efx_impl.h
	@@ -757,6 +757,7 @@
	unsigned int er_label;
	unsigned int er_mask;
	efsys_mem_t *er_esmp;
	+ efx_evq_rxq_state_t *er_ev_qstate;
	};

	#define EFX_RXQ_MAGIC 0x15022005