D18130.id51067.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D18130.id51067.diff
View Options

	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
	@@ -300,7 +300,6 @@
	uint32_t ep_default_adv_cap_mask;
	uint32_t ep_phy_cap_mask;
	boolean_t ep_mac_drain;
	- boolean_t ep_mac_stats_pending;
	#if EFSYS_OPT_BIST
	efx_bist_type_t ep_current_bist;
	#endif
	Index: head/sys/dev/sfxge/common/efx_mac.c
	===================================================================
	--- head/sys/dev/sfxge/common/efx_mac.c
	+++ head/sys/dev/sfxge/common/efx_mac.c
	@@ -756,16 +756,9 @@
	EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PORT);
	EFSYS_ASSERT(emop != NULL);

	- /*
	- * Don't assert !ep_mac_stats_pending, because the client might
	- * have failed to finalise statistics when previously stopping
	- * the port.
	- */
	if ((rc = emop->emo_stats_upload(enp, esmp)) != 0)
	goto fail1;

	- epp->ep_mac_stats_pending = B_TRUE;
	-
	return (0);

	fail1:
	@@ -825,8 +818,6 @@
	EFSYS_ASSERT(emop != NULL);

	rc = emop->emo_stats_update(enp, esmp, essp, generationp);
	- if (rc == 0)
	- epp->ep_mac_stats_pending = B_FALSE;

	return (rc);
	}
	Index: head/sys/dev/sfxge/common/efx_port.c
	===================================================================
	--- head/sys/dev/sfxge/common/efx_port.c
	+++ head/sys/dev/sfxge/common/efx_port.c
	@@ -114,7 +114,6 @@
	EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PORT);

	EFSYS_ASSERT(emop != NULL);
	- EFSYS_ASSERT(!epp->ep_mac_stats_pending);

	if (link_modep == NULL)
	link_modep = &ignore_link_mode;