diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2008-01-31 20:36:50 +0100 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-02-08 01:02:37 +0100 |
| commit | ad294e9cd11d029fc0d09ab129fba5bea46de0dc (patch) | |
| tree | af02c1550725c5e2a20e785ed8cda0ab1f09c6a4 /drivers/scsi/libiscsi.c | |
| parent | [SCSI] qla4xxx: add async scan support (diff) | |
| download | linux-ad294e9cd11d029fc0d09ab129fba5bea46de0dc.tar.xz linux-ad294e9cd11d029fc0d09ab129fba5bea46de0dc.zip | |
[SCSI] libiscsi: fix setting of nop timer
If we rollover then we could get a next_timeout of zero, so we need
to set the new timer to that value.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/libiscsi.c')
| -rw-r--r-- | drivers/scsi/libiscsi.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index c8c00e173414..b2a1ec8725b8 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -1384,14 +1384,11 @@ static void iscsi_check_transport_timeouts(unsigned long data) iscsi_send_nopout(conn, NULL); } next_timeout = last_recv + timeout + (conn->ping_timeout * HZ); - } else { + } else next_timeout = last_recv + timeout; - } - if (next_timeout) { - debug_scsi("Setting next tmo %lu\n", next_timeout); - mod_timer(&conn->transport_timer, next_timeout); - } + debug_scsi("Setting next tmo %lu\n", next_timeout); + mod_timer(&conn->transport_timer, next_timeout); done: spin_unlock(&session->lock); } |