diff options
author | Mike Christie <michaelc@cs.wisc.edu> | 2010-10-08 20:12:10 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-10-25 16:11:29 -0400 |
commit | 73b4376477672a4336cba5f26ede2e277511ce70 (patch) | |
tree | 05aa0d3783ec8e56630ee739b85da9ef5d1cb1f7 /drivers/scsi/libfc | |
parent | f63ae56e4e97fb12053590e41a4fa59e7daa74a4 (diff) |
[SCSI] libfc: fix setting of rport dev loss
There does not seem to be a reason why libfc adds a 5
second delay to the user requested value for the dev loss
tmo. There also does not seem to be a reason to allow
setting it to 0 (or really close).
This patch removes the extra 5 sec delay, and for 0 it
sets it to 1 like other fc drivers. We should actually
be able to set it to 0 since the queue_delayed_work API
will just call queue_work, but other drivers set it to 1 in
that case.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/libfc')
-rw-r--r-- | drivers/scsi/libfc/fc_rport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c index b9f2286fe0cb..a84ef13ed74a 100644 --- a/drivers/scsi/libfc/fc_rport.c +++ b/drivers/scsi/libfc/fc_rport.c | |||
@@ -196,9 +196,9 @@ static const char *fc_rport_state(struct fc_rport_priv *rdata) | |||
196 | void fc_set_rport_loss_tmo(struct fc_rport *rport, u32 timeout) | 196 | void fc_set_rport_loss_tmo(struct fc_rport *rport, u32 timeout) |
197 | { | 197 | { |
198 | if (timeout) | 198 | if (timeout) |
199 | rport->dev_loss_tmo = timeout + 5; | 199 | rport->dev_loss_tmo = timeout; |
200 | else | 200 | else |
201 | rport->dev_loss_tmo = 30; | 201 | rport->dev_loss_tmo = 1; |
202 | } | 202 | } |
203 | EXPORT_SYMBOL(fc_set_rport_loss_tmo); | 203 | EXPORT_SYMBOL(fc_set_rport_loss_tmo); |
204 | 204 | ||