summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/lpfc/lpfc_els.c
diff options
context:
space:
mode:
authorJames Smart2006-07-06 21:49:16 +0200
committerJames Bottomley2006-07-09 17:18:28 +0200
commit5a0e326dfa6d87a1ac6929a7d6d327e8803b7aef (patch)
tree3d257f038e84f46051666b279289b3393cc06a66 /drivers/scsi/lpfc/lpfc_els.c
parent[SCSI] mptsas: use unnumbered port API and remove driver porttracking (diff)
downloadkernel-qcow2-linux-5a0e326dfa6d87a1ac6929a7d6d327e8803b7aef.tar.gz
kernel-qcow2-linux-5a0e326dfa6d87a1ac6929a7d6d327e8803b7aef.tar.xz
kernel-qcow2-linux-5a0e326dfa6d87a1ac6929a7d6d327e8803b7aef.zip
[SCSI] lpfc 8.1.7: Use mod_timer instead of add_timer in lpfc_els_timeout_handler
Use mod_timer instead of add_timer in lpfc_els_timeout_handler This patch was formerly posted by Mark Haverkamp. http://marc.theaimsgroup.com/?l=linux-scsi&m=114246089015681&w=2 Signed-off-by: Mark Haverkamp <markh@osdl.org> Signed-off-by: James Smart <James.Smart@emulex.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_els.c')
-rw-r--r--drivers/scsi/lpfc/lpfc_els.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 4126fd87956f..cac9e870838a 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -3282,10 +3282,9 @@ lpfc_els_timeout_handler(struct lpfc_hba *phba)
} else
lpfc_sli_release_iocbq(phba, piocb);
}
- if (phba->sli.ring[LPFC_ELS_RING].txcmplq_cnt) {
- phba->els_tmofunc.expires = jiffies + HZ * timeout;
- add_timer(&phba->els_tmofunc);
- }
+ if (phba->sli.ring[LPFC_ELS_RING].txcmplq_cnt)
+ mod_timer(&phba->els_tmofunc, jiffies + HZ * timeout);
+
spin_unlock_irq(phba->host->host_lock);
}