From 3d6dd54e2f42d09f40470bb2d0621ee72d93fd80 Mon Sep 17 00:00:00 2001 From: Alexander Motin Date: Mon, 6 May 2013 16:50:39 +0000 Subject: [PATCH] Rework r250298 in more correct way. --- sys/cam/ata/ata_xpt.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c index 11d26504a363..2d9b05d5adf4 100644 --- a/sys/cam/ata/ata_xpt.c +++ b/sys/cam/ata/ata_xpt.c @@ -834,7 +834,6 @@ device_fail: if ((path->device->flags & CAM_DEV_UNCONFIGURED) == 0) { struct ccb_pathinq cpi; int16_t *ptr; - int i; ident_buf = &softc->ident_data; for (ptr = (int16_t *)ident_buf; @@ -914,10 +913,9 @@ device_fail: if ((path->device->flags & CAM_DEV_UNCONFIGURED) == 0) 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); } }