From owner-svn-src-all@freebsd.org Mon Mar 6 06:36:17 2017 Return-Path: Delivered-To: svn-src-all@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 83F70CF8664; Mon, 6 Mar 2017 06:36:17 +0000 (UTC) (envelope-from mav@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 E5C06164E; Mon, 6 Mar 2017 06:36:16 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v266aF8j000388; Mon, 6 Mar 2017 06:36:15 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v266aF27000386; Mon, 6 Mar 2017 06:36:15 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201703060636.v266aF27000386@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 6 Mar 2017 06:36:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314754 - stable/11/sys/cam/ctl X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Mar 2017 06:36:17 -0000 Author: mav Date: Mon Mar 6 06:36:15 2017 New Revision: 314754 URL: https://svnweb.freebsd.org/changeset/base/314754 Log: MFC r314257: Add reporting SAS protocol, in case we ever have one. Modified: stable/11/sys/cam/ctl/ctl.c stable/11/sys/cam/ctl/ctl_frontend.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cam/ctl/ctl.c ============================================================================== --- stable/11/sys/cam/ctl/ctl.c Mon Mar 6 06:35:32 2017 (r314753) +++ stable/11/sys/cam/ctl/ctl.c Mon Mar 6 06:36:15 2017 (r314754) @@ -9549,6 +9549,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/11/sys/cam/ctl/ctl_frontend.c ============================================================================== --- stable/11/sys/cam/ctl/ctl_frontend.c Mon Mar 6 06:35:32 2017 (r314753) +++ stable/11/sys/cam/ctl/ctl_frontend.c Mon Mar 6 06:36:15 2017 (r314754) @@ -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