From owner-svn-src-stable-6@FreeBSD.ORG  Mon Nov  2 19:01:20 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 632EE106566B;
	Mon,  2 Nov 2009 19:01:20 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 507228FC12;
	Mon,  2 Nov 2009 19:01:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA2J1K0r066730;
	Mon, 2 Nov 2009 19:01:20 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA2J1K8b066728;
	Mon, 2 Nov 2009 19:01:20 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <200911021901.nA2J1K8b066728@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 2 Nov 2009 19:01:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198817 - in stable/6/sys: . conf contrib/pf dev/aac
	dev/cxgb
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
	<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Nov 2009 19:01:20 -0000

Author: emaste
Date: Mon Nov  2 19:01:20 2009
New Revision: 198817
URL: http://svn.freebsd.org/changeset/base/198817

Log:
  MFC r197011:
  
    Increase AAC_CMD_TIMEOUT from 30s to 120s to help avoid spurious
    "COMMAND 0x........ TIMEOUT AFTER .. SECONDS" messages.  Any commands
    that get truly stuck will still trigger the warning and the hardware
    health check, just a little bit later.

Modified:
  stable/6/sys/   (props changed)
  stable/6/sys/conf/   (props changed)
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/aac/aacvar.h
  stable/6/sys/dev/cxgb/   (props changed)

Modified: stable/6/sys/dev/aac/aacvar.h
==============================================================================
--- stable/6/sys/dev/aac/aacvar.h	Mon Nov  2 18:51:24 2009	(r198816)
+++ stable/6/sys/dev/aac/aacvar.h	Mon Nov  2 19:01:20 2009	(r198817)
@@ -88,7 +88,7 @@
 /*
  * Timeout for normal commands
  */
-#define AAC_CMD_TIMEOUT		30		/* seconds */
+#define AAC_CMD_TIMEOUT		120		/* seconds */
 
 /*
  * Rate at which we periodically check for timed out commands and kick the