From owner-svn-src-stable-9@FreeBSD.ORG  Wed Oct 15 08:04:44 2014
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AD1FDD7C;
 Wed, 15 Oct 2014 08:04:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 99B11EB0;
 Wed, 15 Oct 2014 08:04:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9F84iVc089993;
 Wed, 15 Oct 2014 08:04:44 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9F84iVH089991;
 Wed, 15 Oct 2014 08:04:44 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201410150804.s9F84iVH089991@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 15 Oct 2014 08:04:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r273126 - stable/9/sys/dev/mpr
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9/>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Oct 2014 08:04:44 -0000

Author: mav
Date: Wed Oct 15 08:04:43 2014
New Revision: 273126
URL: https://svnweb.freebsd.org/changeset/base/273126

Log:
  MFC r272756:  Properly report 12Gbps connection rate.
  
  Reviewed by:	kadesai, slm

Modified:
  stable/9/sys/dev/mpr/mpr_sas.c
  stable/9/sys/dev/mpr/mpr_table.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/mpr/mpr_sas.c
==============================================================================
--- stable/9/sys/dev/mpr/mpr_sas.c	Wed Oct 15 08:03:12 2014	(r273125)
+++ stable/9/sys/dev/mpr/mpr_sas.c	Wed Oct 15 08:04:43 2014	(r273126)
@@ -1045,6 +1045,9 @@ mprsas_action(struct cam_sim *sim, union
 		case 0x0a:
 			sas->bitrate = 600000;
 			break;
+		case 0x0b:
+			sas->bitrate = 1200000;
+			break;
 		default:
 			sas->valid = 0;
 		}

Modified: stable/9/sys/dev/mpr/mpr_table.c
==============================================================================
--- stable/9/sys/dev/mpr/mpr_table.c	Wed Oct 15 08:03:12 2014	(r273125)
+++ stable/9/sys/dev/mpr/mpr_table.c	Wed Oct 15 08:04:43 2014	(r273126)
@@ -118,6 +118,7 @@ struct mpr_table_lookup mpr_linkrate_nam
 	{"1.5Gbps",			0x08},
 	{"3.0Gbps",			0x09},
 	{"6.0Gbps",			0x0a},
+	{"12.0Gbps",			0x0b},
 	{NULL, 0},
 	{"LinkRate Unknown",		0x00}
 };