Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (209 commits)
  [SCSI] fix oops during scsi scanning
  [SCSI] libsrp: fix memory leak in srp_ring_free()
  [SCSI] libiscsi, bnx2i: make bound ep check common
  [SCSI] libiscsi: add completion function for drivers that do not need pdu processing
  [SCSI] scsi_dh_rdac: changes for rdac debug logging
  [SCSI] scsi_dh_rdac: changes to collect the rdac debug information during the initialization
  [SCSI] scsi_dh_rdac: move the init code from rdac_activate to rdac_bus_attach
  [SCSI] sg: fix oops in the error path in sg_build_indirect()
  [SCSI] mptsas : Bump version to 3.04.12
  [SCSI] mptsas : FW event thread and scsi mid layer deadlock in SYNCHRONIZE CACHE command
  [SCSI] mptsas : Send DID_NO_CONNECT for pending IOs of removed device
  [SCSI] mptsas : PAE Kernel more than 4 GB kernel panic
  [SCSI] mptsas : NULL pointer on big endian systems causing Expander not to tear off
  [SCSI] mptsas : Sanity check for phyinfo is added
  [SCSI] scsi_dh_rdac: Add support for Sun StorageTek ST2500, ST2510 and ST2530
  [SCSI] pmcraid: PMC-Sierra MaxRAID driver to support 6Gb/s SAS RAID controller
  [SCSI] qla2xxx: Update version number to 8.03.01-k6.
  [SCSI] qla2xxx: Properly delete rports attached to a vport.
  [SCSI] qla2xxx: Correct various NPIV issues.
  [SCSI] qla2xxx: Correct qla2x00_eh_wait_on_command() to wait correctly.
  ...

1 files changed, 4 insertions, 17 deletions

diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index 1c8514dc31ca..8dd4d219e433 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -76,8 +76,8 @@
 #define COPYRIGHT       "Copyright (c) 1999-2008 " MODULEAUTHOR
 #endif
 
-#define MPT_LINUX_VERSION_COMMON        "3.04.10"
-#define MPT_LINUX_PACKAGE_NAME          "@(#)mptlinux-3.04.09"
+#define MPT_LINUX_VERSION_COMMON        "3.04.12"
+#define MPT_LINUX_PACKAGE_NAME          "@(#)mptlinux-3.04.12"
 #define WHAT_MAGIC_STRING               "@" "(" "#" ")"
 
 #define show_mptmod_ver(s,ver)  \
@@ -157,8 +157,9 @@
 /*
  *      Try to keep these at 2^N-1
  */
-#define MPT_FC_CAN_QUEUE        127
+#define MPT_FC_CAN_QUEUE        1024
 #define MPT_SCSI_CAN_QUEUE      127
+#define MPT_SAS_CAN_QUEUE       127
 
 /*
  * Set the MAX_SGE value based on user input.
@@ -879,23 +880,9 @@ typedef enum {
 
 typedef struct _MPT_SCSI_HOST {
         MPT_ADAPTER              *ioc;
-        int                       port;
-        u32                       pad0;
-        MPT_LOCAL_REPLY          *pLocal;               /* used for internal commands */
-        struct timer_list         timer;
-                /* Pool of memory for holding SCpnts before doing
-                 * OS callbacks. freeQ is the free pool.
-                 */
-        u8                        negoNvram;            /* DV disabled, nego NVRAM */
-        u8                        pad1;
-        u8                        rsvd[2];
-        MPT_FRAME_HDR            *cmdPtr;               /* Ptr to nonOS request */
-        struct scsi_cmnd         *abortSCpnt;
-        MPT_LOCAL_REPLY           localReply;           /* internal cmd reply struct */
         ushort                    sel_timeout[MPT_MAX_FC_DEVICES];
         char                      *info_kbuf;
         long                      last_queue_full;
-        u16                       tm_iocstatus;
         u16                       spi_pending;
         struct list_head          target_reset_list;
 } MPT_SCSI_HOST;