From owner-svn-src-all@FreeBSD.ORG  Mon May  6 16:50:39 2013
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])
 by hub.freebsd.org (Postfix) with ESMTP id E8DF23C8;
 Mon,  6 May 2013 16:50:39 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DBDEBFA;
 Mon,  6 May 2013 16:50:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r46GodUw075889;
 Mon, 6 May 2013 16:50:39 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r46GodEK075888;
 Mon, 6 May 2013 16:50:39 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201305061650.r46GodEK075888@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 6 May 2013 16:50:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250301 - head/sys/cam/ata
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.14
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: Mon, 06 May 2013 16:50:40 -0000

Author: mav
Date: Mon May  6 16:50:39 2013
New Revision: 250301
URL: http://svnweb.freebsd.org/changeset/base/250301

Log:
  Rework r250298 in more correct way.

Modified:
  head/sys/cam/ata/ata_xpt.c

Modified: head/sys/cam/ata/ata_xpt.c
==============================================================================
--- head/sys/cam/ata/ata_xpt.c	Mon May  6 16:42:18 2013	(r250300)
+++ head/sys/cam/ata/ata_xpt.c	Mon May  6 16:50:39 2013	(r250301)
@@ -834,7 +834,6 @@ noerror:
 	{
 		struct ccb_pathinq cpi;
 		int16_t *ptr;
-		int i;
 
 		ident_buf = &softc->ident_data;
 		for (ptr = (int16_t *)ident_buf;
@@ -914,10 +913,9 @@ noerror:
 					path->device->device_id_len = 16;
 					bcopy(&fake_device_id_hdr,
 					    path->device->device_id, 8);
-					for (i = 0; i < 4; i++) {
-						ptr = (int16_t *)(path->device->device_id + 8);
-						ptr[i] = bswap16(ident_buf->wwn[i]);
-					}
+					bcopy(ident_buf->wwn,
+					    path->device->device_id + 8, 8);
+					ata_bswap(path->device->device_id + 8, 8);
 				}
 			}