svn commit: r250301 - head/sys/cam/ata

[Alexander Motin]

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);
 				}
 			}