summaryrefslogtreecommitdiffstats
path: root/sys/cam
diff options
context:
space:
mode:
authornwhitehorn <nwhitehorn@FreeBSD.org>2011-02-26 23:30:32 +0000
committernwhitehorn <nwhitehorn@FreeBSD.org>2011-02-26 23:30:32 +0000
commit76f2936a08a44a2ac6766e368313d64d39813da7 (patch)
treeff11999b4c3dcde75ac91857e3c37b8b8460cf88 /sys/cam
parent6a0eb8185ba164ed9ceb6d0ca634e86792af6dcd (diff)
downloadFreeBSD-src-76f2936a08a44a2ac6766e368313d64d39813da7.zip
FreeBSD-src-76f2936a08a44a2ac6766e368313d64d39813da7.tar.gz
Missed a file in r219056: add disk description for da(4).
Diffstat (limited to 'sys/cam')
-rw-r--r--sys/cam/scsi/scsi_da.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index 3d2c9bc..7790177 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -1310,6 +1310,12 @@ daregister(struct cam_periph *periph, void *arg)
softc->disk->d_flags |= DISKFLAG_CANFLUSHCACHE;
strlcpy(softc->disk->d_ident, cgd->serial_num,
MIN(sizeof(softc->disk->d_ident), cgd->serial_num_len + 1));
+ cam_strvis(softc->disk->d_descr, cgd->inq_data.vendor,
+ sizeof(cgd->inq_data.vendor), sizeof(softc->disk->d_descr));
+ strlcat(softc->disk->d_descr, " ", sizeof(softc->disk->d_descr));
+ cam_strvis(&softc->disk->d_descr[strlen(softc->disk->d_descr)],
+ cgd->inq_data.product, sizeof(cgd->inq_data.product),
+ sizeof(softc->disk->d_descr) - strlen(softc->disk->d_descr));
softc->disk->d_hba_vendor = cpi.hba_vendor;
softc->disk->d_hba_device = cpi.hba_device;
softc->disk->d_hba_subvendor = cpi.hba_subvendor;
OpenPOWER on IntegriCloud