diff options
| author |   krw <krw@openbsd.org> | 2020-09-22 19:32:51 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-09-22 19:32:51 +0000 |
| commit | 664c6166bdf5ef0994a16bcce00610f942c9dc79 (patch) | |
| tree | 99872eb650f923c6761f179e2f45e26d9ab4b156 /sys/dev/pci/qle.c | |
| parent | Document locks which protect `rtpcb' struct members. (diff) | |
| download | wireguard-openbsd-664c6166bdf5ef0994a16bcce00610f942c9dc79.tar.xz wireguard-openbsd-664c6166bdf5ef0994a16bcce00610f942c9dc79.zip | |
Since dlg@'s 2009 scsi midlayer refactoring the 'struct scsi_generic *cmd'
member of 'struct scsi_xfer' has always been pointed at the 'struct scsi_generic
cmdstore' member of the same instance. So nuke 'cmdstore' and remove the '*'
from cmd. Take the address of cmd as required by the various casts.
No intentional functional change.
luna88k test by aoyama@, sparc64 test by jmatthew@
Identification of 2009's last *cmd use and ok jmatthew@
Diffstat (limited to 'sys/dev/pci/qle.c')
| -rw-r--r-- | sys/dev/pci/qle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/qle.c b/sys/dev/pci/qle.c index cee23004f65..0c83be39e6b 100644 --- a/sys/dev/pci/qle.c +++ b/sys/dev/pci/qle.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qle.c,v 1.60 2020/07/22 13:16:05 krw Exp $ */ +/* $OpenBSD: qle.c,v 1.61 2020/09/22 19:32:53 krw Exp $ */ /* * Copyright (c) 2013, 2014 Jonathan Matthew <jmatthew@openbsd.org> @@ -2635,7 +2635,7 @@ qle_put_cmd(struct qle_softc *sc, void *buf, struct scsi_xfer *xs, htobem16(&cmnd->fcp_lun[1], lun >> 16); /* cmnd->fcp_task_attr = TSK_SIMPLE; */ /* cmnd->fcp_task_mgmt = 0; */ - memcpy(cmnd->fcp_cdb, xs->cmd, xs->cmdlen); + memcpy(cmnd->fcp_cdb, &xs->cmd, xs->cmdlen); /* FCP_DL goes after the cdb */ fcp_dl = htobe32(xs->datalen); |