diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2010-10-09 02:12:10 +0200 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-10-25 22:11:29 +0200 |
| commit | 73b4376477672a4336cba5f26ede2e277511ce70 (patch) | |
| tree | 05aa0d3783ec8e56630ee739b85da9ef5d1cb1f7 /drivers/scsi | |
| parent | [SCSI] gdth: integer overflow in ioctl (diff) | |
| download | linux-73b4376477672a4336cba5f26ede2e277511ce70.tar.xz linux-73b4376477672a4336cba5f26ede2e277511ce70.zip | |
[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')
| -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) void fc_set_rport_loss_tmo(struct fc_rport *rport, u32 timeout) { if (timeout) - rport->dev_loss_tmo = timeout + 5; + rport->dev_loss_tmo = timeout; else - rport->dev_loss_tmo = 30; + rport->dev_loss_tmo = 1; } EXPORT_SYMBOL(fc_set_rport_loss_tmo); |