From owner-svn-src-stable@FreeBSD.ORG  Sun Aug  2 10:48:27 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3A1CB106564A;
	Sun,  2 Aug 2009 10:48:27 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 272508FC08;
	Sun,  2 Aug 2009 10:48:27 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n72AmP32012659;
	Sun, 2 Aug 2009 10:48:25 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n72AmPJh012657;
	Sun, 2 Aug 2009 10:48:25 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <200908021048.n72AmPJh012657@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Sun, 2 Aug 2009 10:48:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196032 - in stable/7/sys: . contrib/pf dev/mpt
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Aug 2009 10:48:27 -0000

Author: delphij
Date: Sun Aug  2 10:48:25 2009
New Revision: 196032
URL: http://svn.freebsd.org/changeset/base/196032

Log:
  MFC r195275:
  
  Use MPT_MAX_LUNS as maximium number of LUNs, not 7, for SAS and FC cases.
  This matches Linux driver behavior (except SPI case).

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/mpt/mpt_cam.c

Modified: stable/7/sys/dev/mpt/mpt_cam.c
==============================================================================
--- stable/7/sys/dev/mpt/mpt_cam.c	Sun Aug  2 10:27:54 2009	(r196031)
+++ stable/7/sys/dev/mpt/mpt_cam.c	Sun Aug  2 10:48:25 2009	(r196032)
@@ -3605,7 +3605,10 @@ mpt_action(struct cam_sim *sim, union cc
 		if (mpt->is_spi && cpi->max_target > 15) {
 			cpi->max_target = 15;
 		}
-		cpi->max_lun = 7;
+		if (mpt->is_spi)
+			cpi->max_lun = 7;
+		else
+			cpi->max_lun = MPT_MAX_LUNS;
 		cpi->initiator_id = mpt->mpt_ini_id;
 		cpi->bus_id = cam_sim_bus(sim);