svn commit: r271618 - stable/10/sys/cam/ctl

[Edward Tomasz Napierala]

Author: trasz
Date: Mon Sep 15 11:35:14 2014
New Revision: 271618
URL: http://svnweb.freebsd.org/changeset/base/271618

Log:
  MFC r271393:
  
  Make it possible to disable NOP-In PDUs by the iSCSI initiator by setting
  kern.cam.ctl.iscsi.ping_timeout to 0.  This fixes interoperability with
  some initiators that don't properly support NOP-Ins, namely iPXE/gPXE.
  
  Approved by:	re (kib)

Modified:
  stable/10/sys/cam/ctl/ctl_frontend_iscsi.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/ctl/ctl_frontend_iscsi.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl_frontend_iscsi.c	Mon Sep 15 11:32:08 2014	(r271617)
+++ stable/10/sys/cam/ctl/ctl_frontend_iscsi.c	Mon Sep 15 11:35:14 2014	(r271618)
@@ -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);