From owner-svn-src-all@FreeBSD.ORG  Wed Jul  3 17:57:35 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A24599F3;
 Wed,  3 Jul 2013 17:57:35 +0000 (UTC)
 (envelope-from davidcs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 957411B40;
 Wed,  3 Jul 2013 17:57:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r63HvZ26057685;
 Wed, 3 Jul 2013 17:57:35 GMT (envelope-from davidcs@svn.freebsd.org)
Received: (from davidcs@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r63HvZvN057684;
 Wed, 3 Jul 2013 17:57:35 GMT (envelope-from davidcs@svn.freebsd.org)
Message-Id: <201307031757.r63HvZvN057684@svn.freebsd.org>
From: David C Somayajulu <davidcs@FreeBSD.org>
Date: Wed, 3 Jul 2013 17:57:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252580 - head/sys/dev/qlxgbe
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.14
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: Wed, 03 Jul 2013 17:57:35 -0000

Author: davidcs
Date: Wed Jul  3 17:57:35 2013
New Revision: 252580
URL: http://svnweb.freebsd.org/changeset/base/252580

Log:
  Port 0 needs to wait for ACK only if it issued the RESET.

Modified:
  head/sys/dev/qlxgbe/ql_os.c

Modified: head/sys/dev/qlxgbe/ql_os.c
==============================================================================
--- head/sys/dev/qlxgbe/ql_os.c	Wed Jul  3 17:47:48 2013	(r252579)
+++ head/sys/dev/qlxgbe/ql_os.c	Wed Jul  3 17:57:35 2013	(r252580)
@@ -1646,11 +1646,13 @@ qla_error_recovery(void *context, int pe
 	
 	if ((ha->pci_func & 0x1) == 0) {
 
-		if (!ha->msg_from_peer) 
+		if (!ha->msg_from_peer) {
 			qla_send_msg_to_peer(ha, QL_PEER_MSG_RESET);
 
-		while ((ha->msg_from_peer != QL_PEER_MSG_ACK)  && msecs_100--)
-			qla_mdelay(__func__, 100);
+			while ((ha->msg_from_peer != QL_PEER_MSG_ACK) &&
+				msecs_100--)
+				qla_mdelay(__func__, 100);
+		}
 
 		ha->msg_from_peer = 0;