diff options
author | James Smart <james.smart@emulex.com> | 2013-04-17 20:14:58 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2013-05-02 15:39:54 -0400 |
commit | 256ec0d05f8050339a9cc4e92bdc96cec1ce82bd (patch) | |
tree | 41efc3e2b178401629b9a201011d06c3e4133d9a /drivers/scsi/lpfc/lpfc_hbadisc.c | |
parent | 737d42483ed843b93b67bae9a166bc9fdbc6070b (diff) |
[SCSI] lpfc 8.3.39: Remove driver dependency on HZ
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_hbadisc.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_hbadisc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c index 2ce2ebcc8f17..62deb31fa4b8 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c | |||
@@ -4247,7 +4247,7 @@ lpfc_set_disctmo(struct lpfc_vport *vport) | |||
4247 | tmo, vport->port_state, vport->fc_flag); | 4247 | tmo, vport->port_state, vport->fc_flag); |
4248 | } | 4248 | } |
4249 | 4249 | ||
4250 | mod_timer(&vport->fc_disctmo, jiffies + HZ * tmo); | 4250 | mod_timer(&vport->fc_disctmo, jiffies + msecs_to_jiffies(1000 * tmo)); |
4251 | spin_lock_irq(shost->host_lock); | 4251 | spin_lock_irq(shost->host_lock); |
4252 | vport->fc_flag |= FC_DISC_TMO; | 4252 | vport->fc_flag |= FC_DISC_TMO; |
4253 | spin_unlock_irq(shost->host_lock); | 4253 | spin_unlock_irq(shost->host_lock); |
@@ -5422,7 +5422,8 @@ lpfc_mbx_cmpl_fdmi_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) | |||
5422 | if (vport->cfg_fdmi_on == 1) | 5422 | if (vport->cfg_fdmi_on == 1) |
5423 | lpfc_fdmi_cmd(vport, ndlp, SLI_MGMT_DHBA); | 5423 | lpfc_fdmi_cmd(vport, ndlp, SLI_MGMT_DHBA); |
5424 | else | 5424 | else |
5425 | mod_timer(&vport->fc_fdmitmo, jiffies + HZ * 60); | 5425 | mod_timer(&vport->fc_fdmitmo, |
5426 | jiffies + msecs_to_jiffies(1000 * 60)); | ||
5426 | 5427 | ||
5427 | /* decrement the node reference count held for this callback | 5428 | /* decrement the node reference count held for this callback |
5428 | * function. | 5429 | * function. |