Rework r250298 in more correct way.

This commit is contained in:
Alexander Motin 2013-05-06 16:50:39 +00:00
parent f89d4c3acf
commit 3d6dd54e2f
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=250301

View File

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