diff options
| author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2010-07-22 04:40:42 +0000 |
|---|---|---|
| committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2010-07-22 04:40:42 +0000 |
| commit | 92827df6873506fcd62b3d409c92b958bc136eff (patch) | |
| tree | 05e615b155cb106469ea063e405bda924262fabf | |
| parent | d8d323770b0c84762b0190f2ec8a6fe2e772a91f (diff) | |
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.
| -rw-r--r-- | sys/dev/ic/mfi.c | 4 |
1 files 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 <marco@peereboom.us> * @@ -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; |