From owner-svn-src-head@FreeBSD.ORG  Thu Nov  7 23:21:52 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B7E60A97;
 Thu,  7 Nov 2013 23:21:52 +0000 (UTC) (envelope-from smh@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A3A3C2641;
 Thu,  7 Nov 2013 23:21:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA7NLq8D005568;
 Thu, 7 Nov 2013 23:21:52 GMT (envelope-from smh@svn.freebsd.org)
Received: (from smh@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA7NLqrS005567;
 Thu, 7 Nov 2013 23:21:52 GMT (envelope-from smh@svn.freebsd.org)
Message-Id: <201311072321.rA7NLqrS005567@svn.freebsd.org>
From: Steven Hartland <smh@FreeBSD.org>
Date: Thu, 7 Nov 2013 23:21:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257831 - head/sys/cam/scsi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Nov 2013 23:21:52 -0000

Author: smh
Date: Thu Nov  7 23:21:52 2013
New Revision: 257831
URL: http://svnweb.freebsd.org/changeset/base/257831

Log:
  Corrected definition for old_rate to match d_rotation_rate
  
  MFC after:	2 Days
  X-MFC-With:	r256956

Modified:
  head/sys/cam/scsi/scsi_da.c

Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c	Thu Nov  7 23:05:17 2013	(r257830)
+++ head/sys/cam/scsi/scsi_da.c	Thu Nov  7 23:21:52 2013	(r257831)
@@ -3364,7 +3364,7 @@ dadone(struct cam_periph *periph, union 
 			 * Disable queue sorting for non-rotational media
 			 * by default.
 			 */
-			u_int old_rate = softc->disk->d_rotation_rate;
+			u_int16_t old_rate = softc->disk->d_rotation_rate;
 
 			softc->disk->d_rotation_rate =
 				scsi_2btoul(bdc->medium_rotation_rate);