From owner-cvs-all@FreeBSD.ORG Fri Apr 14 14:11:19 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C62CE16A402; Fri, 14 Apr 2006 14:11:19 +0000 (UTC) (envelope-from ghelmer@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C27E43D48; Fri, 14 Apr 2006 14:11:19 +0000 (GMT) (envelope-from ghelmer@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3EEBJlB069752; Fri, 14 Apr 2006 14:11:19 GMT (envelope-from ghelmer@repoman.freebsd.org) Received: (from ghelmer@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3EEBJhI069748; Fri, 14 Apr 2006 14:11:19 GMT (envelope-from ghelmer) Message-Id: <200604141411.k3EEBJhI069748@repoman.freebsd.org> From: Guy Helmer Date: Fri, 14 Apr 2006 14:11:19 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_5 Cc: Subject: cvs commit: src/sys/dev/aic7xxx aic79xx_osm.c aic7xxx_osm.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 14:11:19 -0000 ghelmer 2006-04-14 14:11:18 UTC FreeBSD src repository Modified files: (Branch: RELENG_5) sys/dev/aic7xxx aic79xx_osm.c aic7xxx_osm.c Log: MFC: aic79xx_osm.c 1.22 aic7xxx_osm.c 1.43 Correct bug that caused the completed "recovery" scb to have its timer reset rather than the timer of an SCB still pending on the controller after recovery completed. This should correct timeout loops seen in the field. This change seems to help with a hang we've seen in the field with SCB timeout recovery. Approved by: re OK'ed by: gibbs Revision Changes Path 1.19.2.3 +2 -1 src/sys/dev/aic7xxx/aic79xx_osm.c 1.41.2.2 +2 -1 src/sys/dev/aic7xxx/aic7xxx_osm.c