From owner-svn-src-all@FreeBSD.ORG  Tue Jul 15 18:27:18 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 AE80F6C3;
 Tue, 15 Jul 2014 18:27:18 +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 9B3452500;
 Tue, 15 Jul 2014 18:27:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6FIRINt026692;
 Tue, 15 Jul 2014 18:27:18 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6FIRIW7026691;
 Tue, 15 Jul 2014 18:27:18 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201407151827.s6FIRIW7026691@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 15 Jul 2014 18:27:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r268707 - stable/10/sys/dev/iscsi
X-SVN-Group: stable-10
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, 15 Jul 2014 18:27:18 -0000

Author: mav
Date: Tue Jul 15 18:27:18 2014
New Revision: 268707
URL: http://svnweb.freebsd.org/changeset/base/268707

Log:
  Fix build on stable/10.

Modified:
  stable/10/sys/dev/iscsi/iscsi.c

Modified: stable/10/sys/dev/iscsi/iscsi.c
==============================================================================
--- stable/10/sys/dev/iscsi/iscsi.c	Tue Jul 15 18:24:41 2014	(r268706)
+++ stable/10/sys/dev/iscsi/iscsi.c	Tue Jul 15 18:27:18 2014	(r268707)
@@ -1994,7 +1994,7 @@ iscsi_action_abort(struct iscsi_session 
 	bhstmr->bhstmr_opcode = ISCSI_BHS_OPCODE_TASK_REQUEST;
 	bhstmr->bhstmr_function = 0x80 | BHSTMR_FUNCTION_ABORT_TASK;
 
-	bhstmr->bhstmr_lun = htobe64(CAM_EXTLUN_BYTE_SWIZZLE(ccb->ccb_h.target_lun));
+	bhstmr->bhstmr_lun = iscsi_encode_lun(ccb->ccb_h.target_lun);
 	bhstmr->bhstmr_initiator_task_tag = is->is_initiator_task_tag;
 	is->is_initiator_task_tag++;
 	bhstmr->bhstmr_referenced_task_tag = aio->io_initiator_task_tag;