Commit ad294e9c authored by Mike Christie's avatar Mike Christie Committed by James Bottomley
Browse files

[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: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 921601b7

drivers/scsi/libiscsi.c

+3 −6
Original line number Diff line number Diff line
@@ -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);

	}

done:

	spin_unlock(&session->lock);

}