From owner-svn-src-all@FreeBSD.ORG  Sat Jan 18 03:45:08 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 144F8D3F;
 Sat, 18 Jan 2014 03:45:08 +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 F4163176C;
 Sat, 18 Jan 2014 03:45:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0I3j751045878;
 Sat, 18 Jan 2014 03:45:07 GMT (envelope-from bryanv@svn.freebsd.org)
Received: (from bryanv@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0I3j7dS045877;
 Sat, 18 Jan 2014 03:45:07 GMT (envelope-from bryanv@svn.freebsd.org)
Message-Id: <201401180345.s0I3j7dS045877@svn.freebsd.org>
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Sat, 18 Jan 2014 03:45:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r260840 - stable/8/sys/dev/virtio/scsi
X-SVN-Group: stable-8
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.17
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: Sat, 18 Jan 2014 03:45:08 -0000

Author: bryanv
Date: Sat Jan 18 03:45:07 2014
New Revision: 260840
URL: http://svnweb.freebsd.org/changeset/base/260840

Log:
  MFC r260566: Remove incorrect bit shift when assigning the LUN request field

Modified:
  stable/8/sys/dev/virtio/scsi/virtio_scsi.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/virtio/   (props changed)

Modified: stable/8/sys/dev/virtio/scsi/virtio_scsi.c
==============================================================================
--- stable/8/sys/dev/virtio/scsi/virtio_scsi.c	Sat Jan 18 03:44:43 2014	(r260839)
+++ stable/8/sys/dev/virtio/scsi/virtio_scsi.c	Sat Jan 18 03:45:07 2014	(r260840)
@@ -1561,7 +1561,7 @@ vtscsi_set_request_lun(struct ccb_hdr *c
 	lun[0] = 1;
 	lun[1] = ccbh->target_id;
 	lun[2] = 0x40 | ((ccbh->target_lun >> 8) & 0x3F);
-	lun[3] = (ccbh->target_lun >> 8) & 0xFF;
+	lun[3] = ccbh->target_lun & 0xFF;
 }
 
 static void