SOURCES (LINUX_2_6): kernel-mpt-fusion.patch - missing hd -> ioc change

[sparky]

Author: sparky                       Date: Mon Mar 30 17:07:51 2009 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- missing hd -> ioc change

---- Files affected:
SOURCES:
   kernel-mpt-fusion.patch (1.1.2.4 -> 1.1.2.5) 

---- Diffs:

================================================================
Index: SOURCES/kernel-mpt-fusion.patch
diff -u SOURCES/kernel-mpt-fusion.patch:1.1.2.4 SOURCES/kernel-mpt-fusion.patch:1.1.2.5
--- SOURCES/kernel-mpt-fusion.patch:1.1.2.4	Mon Mar 30 18:14:35 2009
+++ SOURCES/kernel-mpt-fusion.patch	Mon Mar 30 19:07:45 2009
@@ -24449,7 +24449,7 @@
  		goto out;
  	}
  
-@@ -1825,21 +2026,13 @@ mptscsih_abort(struct scsi_cmnd * SCpnt)
+@@ -1825,27 +2026,19 @@ mptscsih_abort(struct scsi_cmnd * SCpnt)
  		goto out;
  	}
  
@@ -24476,6 +24476,14 @@
  		retval = FAILED;
  		goto out;
  	}
+
+-	if (hd->timeouts < -1)
+-		hd->timeouts++;
++	if (ioc->timeouts < -1)
++		ioc->timeouts++;
+
+	if (mpt_fwfault_debug)
+		mpt_halt_firmware(ioc);
 @@ -1856,25 +2053,31 @@ mptscsih_abort(struct scsi_cmnd * SCpnt)
  	 */
  	mf = MPT_INDEX_2_MFPTR(ioc, scpnt_idx);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-mpt-fusion.patch?r1=1.1.2.4&r2=1.1.2.5&f=u