svn commit: r314755 - stable/10/sys/cam/ctl

[Alexander Motin]

Author: mav
Date: Mon Mar  6 06:36:45 2017
New Revision: 314755
URL: https://svnweb.freebsd.org/changeset/base/314755

Log:
  MFC r314257: Add reporting SAS protocol, in case we ever have one.

Modified:
  stable/10/sys/cam/ctl/ctl.c
  stable/10/sys/cam/ctl/ctl_frontend.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/ctl/ctl.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl.c	Mon Mar  6 06:36:15 2017	(r314754)
+++ stable/10/sys/cam/ctl/ctl.c	Mon Mar  6 06:36:45 2017	(r314755)
@@ -9540,6 +9540,8 @@ ctl_inquiry_evpd_devid(struct ctl_scsiio
 
 	if (port && port->port_type == CTL_PORT_FC)
 		proto = SCSI_PROTO_FC << 4;
+	else if (port->port_type == CTL_PORT_SAS)
+		proto = SCSI_PROTO_SAS << 4;
 	else if (port && port->port_type == CTL_PORT_ISCSI)
 		proto = SCSI_PROTO_ISCSI << 4;
 	else

Modified: stable/10/sys/cam/ctl/ctl_frontend.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl_frontend.c	Mon Mar  6 06:36:15 2017	(r314754)
+++ stable/10/sys/cam/ctl/ctl_frontend.c	Mon Mar  6 06:36:45 2017	(r314755)
@@ -264,6 +264,8 @@ ctl_port_set_wwns(struct ctl_port *port,
 
 	if (port->port_type == CTL_PORT_FC)
 		proto = SCSI_PROTO_FC << 4;
+	else if (port->port_type == CTL_PORT_SAS)
+		proto = SCSI_PROTO_SAS << 4;
 	else if (port->port_type == CTL_PORT_ISCSI)
 		proto = SCSI_PROTO_ISCSI << 4;
 	else