From owner-svn-src-stable@freebsd.org  Fri May  5 20:25:32 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 85787D5F45E;
 Fri,  5 May 2017 20:25:32 +0000 (UTC) (envelope-from ken@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5720C18D7;
 Fri,  5 May 2017 20:25:32 +0000 (UTC) (envelope-from ken@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v45KPVGl043030;
 Fri, 5 May 2017 20:25:31 GMT (envelope-from ken@FreeBSD.org)
Received: (from ken@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v45KPV5W043029;
 Fri, 5 May 2017 20:25:31 GMT (envelope-from ken@FreeBSD.org)
Message-Id: <201705052025.v45KPV5W043029@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ken set sender to ken@FreeBSD.org
 using -f
From: "Kenneth D. Merry" <ken@FreeBSD.org>
Date: Fri, 5 May 2017 20:25:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r317851 - stable/10/sys/cam/scsi
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 May 2017 20:25:32 -0000

Author: ken
Date: Fri May  5 20:25:31 2017
New Revision: 317851
URL: https://svnweb.freebsd.org/changeset/base/317851

Log:
  MFC r317680:
  
    Add the SCSI SSC Manufacturer assigned serial number VPD page.
  
    This is current as of SSC-5r03.
  
  Submitted by:	Sam Klopsch
  Sponsored by:	Spectra Logic

Modified:
  stable/10/sys/cam/scsi/scsi_sa.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/scsi/scsi_sa.h
==============================================================================
--- stable/10/sys/cam/scsi/scsi_sa.h	Fri May  5 20:21:13 2017	(r317850)
+++ stable/10/sys/cam/scsi/scsi_sa.h	Fri May  5 20:25:31 2017	(r317851)
@@ -487,6 +487,19 @@ struct scsi_medium_type_data {
 };
 
 /*
+ * Manufacturer-assigned Serial Number VPD page.
+ * Current as of SSC-5r03, 28 September 2016.
+ */
+struct scsi_vpd_mfg_serial_number
+{
+	u_int8_t device;
+	u_int8_t page_code;
+#define	SVPD_MFG_SERIAL_NUMBER_PAGE_CODE 0xB1
+	u_int8_t page_length[2];
+	u_int8_t mfg_serial_num[];
+};
+
+/*
  * Security Protocol Specific values for the Tape Data Encryption protocol
  * (0x20) used with SECURITY PROTOCOL IN.  See below for values used with
  * SECURITY PROTOCOL OUT.  Current as of SSC4r03.