summaryrefslogtreecommitdiffstats
path: root/sys/cam
diff options
context:
space:
mode:
authortrasz <trasz@FreeBSD.org>2014-09-10 14:04:10 +0000
committertrasz <trasz@FreeBSD.org>2014-09-10 14:04:10 +0000
commitd8aaa0480ad6b6338180fa978ed574f0cb35004c (patch)
tree400d24a3377dc2a7d765fd4084f8697160136c25 /sys/cam
parenta363841a1850d81bd271ae11c02cd4195ff4abc7 (diff)
downloadFreeBSD-src-d8aaa0480ad6b6338180fa978ed574f0cb35004c.zip
FreeBSD-src-d8aaa0480ad6b6338180fa978ed574f0cb35004c.tar.gz
Make sure we handle less than zero timeouts in iSCSI initiator and target
in a reasonable way. Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/cam')
-rw-r--r--sys/cam/ctl/ctl_frontend_iscsi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c
index 247b4ee..2dbc8d1 100644
--- a/sys/cam/ctl/ctl_frontend_iscsi.c
+++ b/sys/cam/ctl/ctl_frontend_iscsi.c
@@ -993,7 +993,7 @@ cfiscsi_callout(void *context)
#ifdef ICL_KERNEL_PROXY
if (cs->cs_waiting_for_ctld || cs->cs_login_phase) {
- if (cs->cs_timeout > login_timeout) {
+ if (login_timeout > 0 && cs->cs_timeout > login_timeout) {
CFISCSI_SESSION_WARN(cs, "login timed out after "
"%d seconds; dropping connection", cs->cs_timeout);
cfiscsi_session_terminate(cs);
OpenPOWER on IntegriCloud