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: (147 commits)
  [SCSI] arcmsr: fix write to device check
  [SCSI] lpfc: lower stack use in lpfc_fc_frame_check
  [SCSI] eliminate an unnecessary local variable from scsi_remove_target()
  [SCSI] libiscsi: use bh locking instead of irq with session lock
  [SCSI] libiscsi: do not take host lock in queuecommand
  [SCSI] be2iscsi: fix null ptr when accessing task hdr
  [SCSI] be2iscsi: fix gfp use in alloc_pdu
  [SCSI] libiscsi: add more informative failure message during iscsi scsi eh
  [SCSI] gdth: Add missing call to gdth_ioctl_free
  [SCSI] bfa: remove unused defintions and misc cleanups
  [SCSI] bfa: remove inactive functions
  [SCSI] bfa: replace bfa_assert with WARN_ON
  [SCSI] qla2xxx: Use sg_next to fetch next sg element while walking sg list.
  [SCSI] qla2xxx: Fix to avoid recursive lock failure during BSG timeout.
  [SCSI] qla2xxx: Remove code to not reset ISP82xx on failure.
  [SCSI] qla2xxx: Display mailbox register 4 during 8012 AEN for ISP82XX parts.
  [SCSI] qla2xxx: Don't perform a BIG_HAMMER if Get-ID (0x20) mailbox command fails on CNAs.
  [SCSI] qla2xxx: Remove redundant module parameter permission bits
  [SCSI] qla2xxx: Add sysfs node for displaying board temperature.
  [SCSI] qla2xxx: Code cleanup to remove unwanted comments and code.
  ...

1 files changed, 3 insertions, 19 deletions

diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index 2d2f9c879bfd..f65626aec7c1 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -1,6 +1,6 @@
 /*
  * QLogic iSCSI HBA Driver
- * Copyright (c)  2003-2006 QLogic Corporation
+ * Copyright (c)  2003-2010 QLogic Corporation
  *
  * See LICENSE.qla4xxx for copyright and licensing details.
  */
@@ -81,23 +81,7 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
          */
         spin_lock_irqsave(&ha->hardware_lock, flags);
 
-        if (is_qla8022(ha)) {
-                intr_status = readl(&ha->qla4_8xxx_reg->host_int);
-                if (intr_status & ISRX_82XX_RISC_INT) {
-                        /* Service existing interrupt */
-                        DEBUG2(printk("scsi%ld: %s: "
-                            "servicing existing interrupt\n",
-                            ha->host_no, __func__));
-                        intr_status = readl(&ha->qla4_8xxx_reg->host_status);
-                        ha->isp_ops->interrupt_service_routine(ha, intr_status);
-                        clear_bit(AF_MBOX_COMMAND_DONE, &ha->flags);
-                        if (test_bit(AF_INTERRUPTS_ON, &ha->flags) &&
-                            test_bit(AF_INTx_ENABLED, &ha->flags))
-                                qla4_8xxx_wr_32(ha,
-                                    ha->nx_legacy_intr.tgt_mask_reg,
-                                    0xfbff);
-                }
-        } else {
+        if (!is_qla8022(ha)) {
                 intr_status = readl(&ha->reg->ctrl_status);
                 if (intr_status & CSR_SCSI_PROCESSOR_INTR) {
                         /* Service existing interrupt */
@@ -934,7 +918,7 @@ int qla4xxx_abort_task(struct scsi_qla_host *ha, struct srb *srb)
                 return status;
 
         mbox_cmd[0] = MBOX_CMD_ABORT_TASK;
-        mbox_cmd[1] = srb->fw_ddb_index;
+        mbox_cmd[1] = srb->ddb->fw_ddb_index;
         mbox_cmd[2] = index;
         /* Immediate Command Enable */
         mbox_cmd[5] = 0x01;