[PATCH] megaraid 2.20.4: fix a data corruption bug

Fixes a data corruption issue. Because of a typo in the driver, IO packets
were wrongly shared by the IOCTL path. This caused the whole IO command
to be replaced by an incoming IOCTL command.

diff --git a/Documentation/scsi/ChangeLog.megaraid b/Documentation/scsi/ChangeLog.megaraid
index 14341d317cb3ed6964de93f3091179e9cf41c816..431e3983e447db2727c491beebba605eb86a1dcd 100644 (file)
--- a/Documentation/scsi/ChangeLog.megaraid
+++ b/Documentation/scsi/ChangeLog.megaraid
@@ -1,3 +1,11 @@
+Release Date   : Mon Sep 27 22:15:07 EDT 2004 - Atul Mukker <atulm@lsil.com>
+Current Version        : 2.20.4.0 (scsi module), 2.20.2.0 (cmm module)
+Older Version  : 2.20.3.1 (scsi module), 2.20.2.0 (cmm module)
+
+i.     Fix data corruption. Because of a typo in the driver, the IO packets
+       were wrongly shared by the ioctl path. This causes a whole IO command
+       to be replaced by an incoming ioctl command.
+
 Release Date   : Tue Aug 24 09:43:35 EDT 2004 - Atul Mukker <atulm@lsil.com>
 Current Version        : 2.20.3.1 (scsi module), 2.20.2.0 (cmm module)
 Older Version  : 2.20.3.0 (scsi module), 2.20.2.0 (cmm module)

diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 6ff9a71cb1eacb30e312ff78c56d9f95e812d351..7afd6a5f12330b2f0aec1b18a6376b147deafb83 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -10,7 +10,7 @@
  *        2 of the License, or (at your option) any later version.
  *
  * FILE                : megaraid_mbox.c
- * Version     : v2.20.3.1 (August 24 2004)
+ * Version     : v2.20.4 (September 27 2004)
  *
  * Authors:
  *     Atul Mukker             <Atul.Mukker@lsil.com>
@@ -197,7 +197,7 @@ MODULE_PARM_DESC(debug_level, "Debug level for driver (default=0)");
  * ### global data ###
  */
 static uint8_t megaraid_mbox_version[8] =
-       { 0x02, 0x20, 0x02, 0x00, 7, 22, 20, 4 };
+       { 0x02, 0x20, 0x04, 0x00, 9, 27, 20, 4 };
 
 
 /*
@@ -3562,7 +3562,7 @@ megaraid_cmm_register(adapter_t *adapter)
        for (i = 0; i < MBOX_MAX_USER_CMDS; i++) {
 
                scb                     = adapter->uscb_list + i;
-               ccb                     = raid_dev->ccb_list + i;
+               ccb                     = raid_dev->uccb_list + i;
 
                scb->ccb                = (caddr_t)ccb;
                ccb->mbox64             = raid_dev->umbox64 + i;

diff --git a/drivers/scsi/megaraid/megaraid_mbox.h b/drivers/scsi/megaraid/megaraid_mbox.h
index f4cf8d0c9004b68f82e3314497e148a1e3a61d09..2f195abc69063441cc34da72c3935c49aefbb65e 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_mbox.h
+++ b/drivers/scsi/megaraid/megaraid_mbox.h
@@ -21,8 +21,8 @@
 #include "megaraid_ioctl.h"
 
 
-#define MEGARAID_VERSION       "2.20.3.1"
-#define MEGARAID_EXT_VERSION   "(Release Date: Tue Aug 24 09:43:35 EDT 2004)"
+#define MEGARAID_VERSION       "2.20.4.0"
+#define MEGARAID_EXT_VERSION   "(Release Date: Mon Sep 27 22:15:07 EDT 2004)"
 
 
 /*