summaryrefslogtreecommitdiffstats
path: root/sys/dev/ata/atascsi.c
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2020-09-05 13:05:06 +0000
committerkrw <krw@openbsd.org>2020-09-05 13:05:06 +0000
commit3ca8dabf571cb4518c56816a558429e4482a40d0 (patch)
tree8eb4de707ceaeb49bd59c07e5583ccabbbd52eb9 /sys/dev/ata/atascsi.c
parenthttpd(8) uses TLSv1.3 and TLSv1.2 by default (diff)
downloadwireguard-openbsd-3ca8dabf571cb4518c56816a558429e4482a40d0.tar.xz
wireguard-openbsd-3ca8dabf571cb4518c56816a558429e4482a40d0.zip
Replace '32' with SID_SCSI2_ALEN (a.k.a. 31) when building emulated INQUIRY
responses. This is what the SCSI specifications say is the correct value and already used in several cases.
Diffstat (limited to 'sys/dev/ata/atascsi.c')
-rw-r--r--sys/dev/ata/atascsi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c
index ec1e371d329..219593bdb1c 100644
--- a/sys/dev/ata/atascsi.c
+++ b/sys/dev/ata/atascsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atascsi.c,v 1.147 2020/09/03 12:41:29 krw Exp $ */
+/* $OpenBSD: atascsi.c,v 1.148 2020/09/05 13:05:06 krw Exp $ */
/*
* Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -710,7 +710,7 @@ atascsi_disk_inquiry(struct scsi_xfer *xs)
inq.device = T_DIRECT;
inq.version = SCSI_REV_SPC3;
inq.response_format = SID_SCSI2_RESPONSE;
- inq.additional_length = 32;
+ inq.additional_length = SID_SCSI2_ALEN;
inq.flags |= SID_CmdQue;
bcopy("ATA ", inq.vendor, sizeof(inq.vendor));
ata_swapcopy(ap->ap_identify.model, inq.product,
@@ -1735,7 +1735,7 @@ atascsi_pmp_inq(struct scsi_xfer *xs)
inq.device = 0x1E; /* "well known logical unit" seems reasonable */
inq.version = SCSI_REV_SPC3;
inq.response_format = SID_SCSI2_RESPONSE;
- inq.additional_length = 32;
+ inq.additional_length = SID_SCSI2_ALEN;
inq.flags |= SID_CmdQue;
bcopy("ATA ", inq.vendor, sizeof(inq.vendor));