summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/cam/ctl/ctl_frontend_iscsi.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c
index d31370c..dc12006 100644
--- a/sys/cam/ctl/ctl_frontend_iscsi.c
+++ b/sys/cam/ctl/ctl_frontend_iscsi.c
@@ -1006,6 +1006,19 @@ cfiscsi_callout(void *context)
}
#endif
+ if (ping_timeout <= 0) {
+ /*
+ * Pings are disabled. Don't send NOP-In in this case;
+ * user might have disabled pings to work around problems
+ * with certain initiators that can't properly handle
+ * NOP-In, such as iPXE. Reset the timeout, to avoid
+ * triggering reconnection, should the user decide to
+ * reenable them.
+ */
+ cs->cs_timeout = 0;
+ return;
+ }
+
if (cs->cs_timeout >= ping_timeout) {
CFISCSI_SESSION_WARN(cs, "no ping reply (NOP-Out) after %d seconds; "
"dropping connection", ping_timeout);
OpenPOWER on IntegriCloud