From owner-svn-src-all@FreeBSD.ORG  Tue Jul  8 13:01:36 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C8C792CC;
 Tue,  8 Jul 2014 13:01:36 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B63AF2FE2;
 Tue,  8 Jul 2014 13:01:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s68D1a38063247;
 Tue, 8 Jul 2014 13:01:36 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s68D1a0X063246;
 Tue, 8 Jul 2014 13:01:36 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201407081301.s68D1a0X063246@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 8 Jul 2014 13:01:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r268395 - head/sys/dev/isp
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Jul 2014 13:01:36 -0000

Author: mav
Date: Tue Jul  8 13:01:36 2014
New Revision: 268395
URL: http://svnweb.freebsd.org/changeset/base/268395

Log:
  Pass correct command that should be aborted to ISPCTL_ABORT_CMD.
  
  This makes XPT_ABORT to work for me on initiator side of isp(4).
  Previous code was trying to abort the XPT_ABORT itself and failed.
  
  MFC after:	1 week

Modified:
  head/sys/dev/isp/isp_freebsd.c

Modified: head/sys/dev/isp/isp_freebsd.c
==============================================================================
--- head/sys/dev/isp/isp_freebsd.c	Tue Jul  8 12:46:33 2014	(r268394)
+++ head/sys/dev/isp/isp_freebsd.c	Tue Jul  8 13:01:36 2014	(r268395)
@@ -5107,7 +5107,7 @@ isp_action(struct cam_sim *sim, union cc
 			break;
 #endif
 		case XPT_SCSI_IO:
-			error = isp_control(isp, ISPCTL_ABORT_CMD, ccb);
+			error = isp_control(isp, ISPCTL_ABORT_CMD, accb);
 			if (error) {
 				ccb->ccb_h.status = CAM_UA_ABORT;
 			} else {