Merge by Hand

Conflicts in dec_esp.c (Thanks Bacchus), scsi_transport_iscsi.c and
scsi_transport_fc.h

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/qlogicfas408.c b/drivers/scsi/qlogicfas408.c
index cb75e0b7baea..52fb2ec3da70 100644
--- a/drivers/scsi/qlogicfas408.c
+++ b/drivers/scsi/qlogicfas408.c
@@ -243,7 +243,7 @@ static void ql_icmd(Scsi_Cmnd * cmd)
          /**/ outb(qlcfg5, qbase + 5);  /* select timer */
         outb(qlcfg9 & 7, qbase + 9);    /* prescaler */
 /*      outb(0x99, qbase + 5);  */
-        outb(cmd->device->id, qbase + 4);
+        outb(scmd_id(cmd), qbase + 4);
 
         for (i = 0; i < cmd->cmd_len; i++)
                 outb(cmd->cmnd[i], qbase + 2);
@@ -450,7 +450,7 @@ irqreturn_t qlogicfas408_ihandl(int irq, void *dev_id, struct pt_regs *regs)
 int qlogicfas408_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *))
 {
         struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd);
-        if (cmd->device->id == priv->qinitid) {
+        if (scmd_id(cmd) == priv->qinitid) {
                 cmd->result = DID_BAD_TARGET << 16;
                 done(cmd);
                 return 0;