[SCSI] qla4xxx: use correct fw_ddb_index in abort task

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: Karen Higgins <karen.higgins@qlogic.com>
Signed-off-by: Ravi Anand <ravi.anand@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

2 files changed, 2 insertions, 3 deletions

diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index 0f3bfc3da5cf..060e64f57a3d 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -175,7 +175,7 @@
 struct srb {
         struct list_head list;  /* (8)   */
         struct scsi_qla_host *ha;       /* HA the SP is queued on */
-        struct ddb_entry        *ddb;
+        struct ddb_entry *ddb;
         uint16_t flags;         /* (1) Status flags. */
 
 #define SRB_DMA_VALID           BIT_3   /* DMA Buffer mapped. */
@@ -191,7 +191,6 @@ struct srb {
         struct scsi_cmnd *cmd;  /* (4) SCSI command block */
         dma_addr_t dma_handle;  /* (4) for unmap of single transfers */
         struct kref srb_ref;    /* reference count for this srb */
-        uint32_t fw_ddb_index;
         uint8_t err_id;         /* error id */
 #define SRB_ERR_PORT       1    /* Request failed because "port down" */
 #define SRB_ERR_LOOP       2    /* Request failed because "loop down" */
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index 2d2f9c879bfd..8961d4c03e3b 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -934,7 +934,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;