diff options
| author |   James Bottomley <JBottomley@Parallels.com> | 2013-03-01 09:09:51 +0000 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-03-01 09:10:08 +0000 |
| commit | 3e34c1fc2b51f117045e4a2472572f14ac91df6e (patch) | |
| tree | 12c7c79931e657483f965bc944861bc8a6a9694d /drivers/scsi/libfc/fc_rport.c | |
| parent | Merge tag 'uapi-20121219' into for-linus (diff) | |
| parent | libfcoe: Check for unusable FCFs before looking for conflicting FCFs (diff) | |
| download | linux-dev-3e34c1fc2b51f117045e4a2472572f14ac91df6e.tar.xz linux-dev-3e34c1fc2b51f117045e4a2472572f14ac91df6e.zip | |
[SCSI] Merge tag 'fcoe-02-19-13' into for-linus
FCoE Updates for 3.9
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/libfc/fc_rport.c')
| -rw-r--r-- | drivers/scsi/libfc/fc_rport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c index 83aa1efec875..d518d17e940f 100644 --- a/drivers/scsi/libfc/fc_rport.c +++ b/drivers/scsi/libfc/fc_rport.c @@ -582,7 +582,7 @@ static void fc_rport_error(struct fc_rport_priv *rdata, struct fc_frame *fp) static void fc_rport_error_retry(struct fc_rport_priv *rdata, struct fc_frame *fp) { - unsigned long delay = FC_DEF_E_D_TOV; + unsigned long delay = msecs_to_jiffies(FC_DEF_E_D_TOV); /* make sure this isn't an FC_EX_CLOSED error, never retry those */ if (PTR_ERR(fp) == -FC_EX_CLOSED) |