From 63424713e5ea58014df7585cb2fe11fa4042e6c9 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Mon, 23 Mar 2015 15:52:57 +0000 Subject: [PATCH] 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. Differential Revision: https://reviews.freebsd.org/D2084 --- sys/dev/sfxge/common/efx_mcdi.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/dev/sfxge/common/efx_mcdi.c b/sys/dev/sfxge/common/efx_mcdi.c index 5826c8af852..f389d57c7ac 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