From e62414c4cd28137c7d71056c1b3966b400a7e4c3 Mon Sep 17 00:00:00 2001 From: Mike Christie Date: Thu, 31 Jan 2008 13:36:50 -0600 Subject: [PATCH] --- yaml --- r: 84389 b: refs/heads/master c: ad294e9cd11d029fc0d09ab129fba5bea46de0dc h: refs/heads/master i: 84387: 853ff7bc134ff9b6aa86f77ae844ba65fd827774 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libiscsi.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 99741d18ab02..a287e8ecf7fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 921601b7031f8a2c71f49f1b965ee00ebbca6886 +refs/heads/master: ad294e9cd11d029fc0d09ab129fba5bea46de0dc diff --git a/trunk/drivers/scsi/libiscsi.c b/trunk/drivers/scsi/libiscsi.c index c8c00e173414..b2a1ec8725b8 100644 --- a/trunk/drivers/scsi/libiscsi.c +++ b/trunk/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); }