From owner-svn-src-all@FreeBSD.ORG  Mon Mar 23 15:52:58 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D067F9CB;
 Mon, 23 Mar 2015 15:52:58 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BBDA611E;
 Mon, 23 Mar 2015 15:52:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2NFqwjW050771;
 Mon, 23 Mar 2015 15:52:58 GMT (envelope-from arybchik@FreeBSD.org)
Received: (from arybchik@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2NFqwLE050770;
 Mon, 23 Mar 2015 15:52:58 GMT (envelope-from arybchik@FreeBSD.org)
Message-Id: <201503231552.t2NFqwLE050770@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: arybchik set sender to
 arybchik@FreeBSD.org using -f
From: Andrew Rybchenko <arybchik@FreeBSD.org>
Date: Mon, 23 Mar 2015 15:52:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280379 - head/sys/dev/sfxge/common
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Mar 2015 15:52:58 -0000

Author: arybchik
Date: Mon Mar 23 15:52:57 2015
New Revision: 280379
URL: https://svnweb.freebsd.org/changeset/base/280379

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

Modified:
  head/sys/dev/sfxge/common/efx_mcdi.c

Modified: head/sys/dev/sfxge/common/efx_mcdi.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_mcdi.c	Mon Mar 23 15:52:05 2015	(r280378)
+++ head/sys/dev/sfxge/common/efx_mcdi.c	Mon Mar 23 15:52:57 2015	(r280379)
@@ -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