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

[Edward Tomasz Napierala]

Author: trasz
Date: Thu Apr 17 12:41:12 2014
New Revision: 264602
URL: http://svnweb.freebsd.org/changeset/base/264602

Log:
  MFC r262837:
  
  Make reset handling in iSCSI target RFC-compliant.  This fixes some rare
  hangs with Open-iSCSI (Linux).
  
  Sponsored by:	The FreeBSD Foundation

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	Thu Apr 17 12:33:26 2014	(r264601)
+++ stable/10/sys/cam/ctl/ctl_frontend_iscsi.c	Thu Apr 17 12:41:12 2014	(r264602)
@@ -633,11 +633,11 @@ cfiscsi_pdu_handle_task_request(struct i
 #endif
 		io->taskio.task_action = CTL_TASK_LUN_RESET;
 		break;
-	case BHSTMR_FUNCTION_TARGET_COLD_RESET:
+	case BHSTMR_FUNCTION_TARGET_WARM_RESET:
 #if 0
-		CFISCSI_SESSION_DEBUG(cs, "BHSTMR_FUNCTION_TARGET_COLD_RESET");
+		CFISCSI_SESSION_DEBUG(cs, "BHSTMR_FUNCTION_TARGET_WARM_RESET");
 #endif
-		io->taskio.task_action = CTL_TASK_BUS_RESET;
+		io->taskio.task_action = CTL_TASK_TARGET_RESET;
 		break;
 	default:
 		CFISCSI_SESSION_DEBUG(cs, "unsupported function 0x%x",