From owner-svn-src-head@FreeBSD.ORG  Thu Mar  6 10:45:53 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AB72591B;
 Thu,  6 Mar 2014 10:45:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 988FCF42;
 Thu,  6 Mar 2014 10:45:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26Ajrnk037722;
 Thu, 6 Mar 2014 10:45:53 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26AjrmZ037721;
 Thu, 6 Mar 2014 10:45:53 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201403061045.s26AjrmZ037721@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 6 Mar 2014 10:45:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r262837 - head/sys/cam/ctl
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Mar 2014 10:45:53 -0000

Author: trasz
Date: Thu Mar  6 10:45:53 2014
New Revision: 262837
URL: http://svnweb.freebsd.org/changeset/base/262837

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

Modified:
  head/sys/cam/ctl/ctl_frontend_iscsi.c

Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c
==============================================================================
--- head/sys/cam/ctl/ctl_frontend_iscsi.c	Thu Mar  6 10:26:25 2014	(r262836)
+++ head/sys/cam/ctl/ctl_frontend_iscsi.c	Thu Mar  6 10:45:53 2014	(r262837)
@@ -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",