From 0e1a1e7590beb097a89b530e2de881515760e5aa Mon Sep 17 00:00:00 2001 From: matthew Date: Thu, 22 Jul 2010 04:40:41 +0000 Subject: [PATCH] SCSI HBA drivers are supposed to get their SCSI CDBs from xs->cmd, not xs->cmdstore. ok krw@ a while back (contingent upon testing), and deraadt@ says this has been in snapshots for weeks now. --- sys/dev/ic/mfi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c index 9d6359f520a..1235d9fe338 100644 --- a/sys/dev/ic/mfi.c +++ b/sys/dev/ic/mfi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfi.c,v 1.109 2010/07/01 03:20:38 matthew Exp $ */ +/* $OpenBSD: mfi.c,v 1.110 2010/07/22 04:40:41 matthew Exp $ */ /* * Copyright (c) 2006 Marco Peereboom * @@ -946,7 +946,7 @@ mfi_scsi_ld(struct mfi_ccb *ccb, struct scsi_xfer *xs) pf->mpf_sense_addr_lo = htole32(ccb->ccb_psense); memset(pf->mpf_cdb, 0, 16); - memcpy(pf->mpf_cdb, &xs->cmdstore, xs->cmdlen); + memcpy(pf->mpf_cdb, xs->cmd, xs->cmdlen); ccb->ccb_done = mfi_scsi_xs_done; ccb->ccb_cookie = xs; -- 2.20.1