svn commit: r301382 - stable/10/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Sat Jun  4 16:56:36 2016
New Revision: 301382
URL: https://svnweb.freebsd.org/changeset/base/301382

Log:
  MFC r300010
  
  sfxge(4): restore clearing of MCDI new epoch flag in common code
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.

Modified:
  stable/10/sys/dev/sfxge/common/efx_mcdi.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/common/efx_mcdi.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_mcdi.c	Sat Jun  4 16:54:28 2016	(r301381)
+++ stable/10/sys/dev/sfxge/common/efx_mcdi.c	Sat Jun  4 16:56:36 2016	(r301382)
@@ -535,6 +535,9 @@ efx_mcdi_request_poll(
 	/* Request complete */
 	emip->emi_pending_req = NULL;
 
+	/* Ensure stale MCDI requests fail after an MC reboot. */
+	emip->emi_new_epoch = B_FALSE;
+
 	EFSYS_UNLOCK(enp->en_eslp, state);
 
 	if ((rc = emrp->emr_rc) != 0)