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

[Andrew Rybchenko]

Author: arybchik
Date: Wed Mar 25 13:53:28 2015
New Revision: 280609
URL: https://svnweb.freebsd.org/changeset/base/280609

Log:
  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

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	Wed Mar 25 13:52:31 2015	(r280608)
+++ stable/10/sys/dev/sfxge/common/efx_mcdi.c	Wed Mar 25 13:53:28 2015	(r280609)
@@ -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