svn commit: r249900 - stable/7/sys/dev/ciss

[Sean Bruno]

Author: sbruno
Date: Thu Apr 25 17:06:07 2013
New Revision: 249900
URL: http://svnweb.freebsd.org/changeset/base/249900

Log:
  MFC r249349
  
  Repair camcontrol output and use CAM defined values for string sizes

Modified:
  stable/7/sys/dev/ciss/ciss.c
Directory Properties:
  stable/7/sys/   (props changed)

Modified: stable/7/sys/dev/ciss/ciss.c
==============================================================================
--- stable/7/sys/dev/ciss/ciss.c	Thu Apr 25 17:04:48 2013	(r249899)
+++ stable/7/sys/dev/ciss/ciss.c	Thu Apr 25 17:06:07 2013	(r249900)
@@ -3044,9 +3044,14 @@ ciss_cam_complete_fixup(struct ciss_soft
 
 	cl = &sc->ciss_logical[bus][target];
 
-	padstr(inq->vendor, "COMPAQ", 8);
-	padstr(inq->product, ciss_name_ldrive_org(cl->cl_ldrive->fault_tolerance), 8);
-	padstr(inq->revision, ciss_name_ldrive_status(cl->cl_lstatus->status), 16);
+	padstr(inq->vendor, "COMPAQ",
+	       SID_VENDOR_SIZE);
+	padstr(inq->product,
+	       ciss_name_ldrive_org(cl->cl_ldrive->fault_tolerance),
+	       SID_PRODUCT_SIZE);
+	padstr(inq->revision,
+	       ciss_name_ldrive_status(cl->cl_lstatus->status),
+	       SID_REVISION_SIZE);
     }
 }