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

Author: emaste
Date: Mon Nov  2 16:55:33 2009
New Revision: 198810
URL: http://svn.freebsd.org/changeset/base/198810

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/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/aac/aacvar.h

Modified: stable/7/sys/dev/aac/aacvar.h
==============================================================================
--- stable/7/sys/dev/aac/aacvar.h	Mon Nov  2 16:54:23 2009	(r198809)
+++ stable/7/sys/dev/aac/aacvar.h	Mon Nov  2 16:55:33 2009	(r198810)
@@ -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