From fdbffbab18667b6bc8ac76c16316950646127da2 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Tue, 17 May 2016 06:27:19 +0000 Subject: [PATCH] sfxge(4): restore clearing of MCDI new epoch flag in common code Submitted by: Andy Moreton Sponsored by: Solarflare Communications, Inc. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D6390 --- sys/dev/sfxge/common/efx_mcdi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/sfxge/common/efx_mcdi.c b/sys/dev/sfxge/common/efx_mcdi.c index 6a381577600..5fd484e20f9 100644 --- a/sys/dev/sfxge/common/efx_mcdi.c +++ b/sys/dev/sfxge/common/efx_mcdi.c @@ -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)