summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarybchik <arybchik@FreeBSD.org>2015-03-25 13:53:28 +0000
committerarybchik <arybchik@FreeBSD.org>2015-03-25 13:53:28 +0000
commitdb5c720e7a8518940771f5e4e3bd84c1e4ed7fe9 (patch)
treee6d3f8b957b0692d621d3be978abfc69385f7357
parent7df9d164f1470ef69b776d52e168a67e4f6d0009 (diff)
downloadFreeBSD-src-db5c720e7a8518940771f5e4e3bd84c1e4ed7fe9.zip
FreeBSD-src-db5c720e7a8518940771f5e4e3bd84c1e4ed7fe9.tar.gz
MFC: 280379
sfxge: do not check MCDI status word This is a temporary workaround until we determine a reliable sequence of operations for detecting MC reboots. Sponsored by: Solarflare Communications, Inc. Original Differential Revision: https://reviews.freebsd.org/D2084
-rw-r--r--sys/dev/sfxge/common/efx_mcdi.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/sys/dev/sfxge/common/efx_mcdi.c b/sys/dev/sfxge/common/efx_mcdi.c
index 5826c8a..f389d57 100644
--- a/sys/dev/sfxge/common/efx_mcdi.c
+++ b/sys/dev/sfxge/common/efx_mcdi.c
@@ -213,6 +213,14 @@ static int
efx_mcdi_poll_reboot(
__in efx_nic_t *enp)
{
+#ifndef EFX_GRACEFUL_MC_REBOOT
+ /*
+ * This function is not being used properly.
+ * Until its callers are fixed, it should always return 0.
+ */
+ _NOTE(ARGUNUSED(enp))
+ return (0);
+#else
efx_mcdi_iface_t *emip = &(enp->en_u.siena.enu_mip);
unsigned int rebootr;
efx_dword_t dword;
@@ -236,6 +244,7 @@ efx_mcdi_poll_reboot(
return (EINTR);
else
return (EIO);
+#endif
}
__checkReturn boolean_t
OpenPOWER on IntegriCloud