From owner-cvs-src@FreeBSD.ORG  Tue Jul 25 01:00:39 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5B3AF16A5CA;
	Tue, 25 Jul 2006 01:00:39 +0000 (UTC)
	(envelope-from mjacob@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 22B1343DC6;
	Tue, 25 Jul 2006 01:00:06 +0000 (GMT)
	(envelope-from mjacob@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6P0xsXq067339;
	Tue, 25 Jul 2006 00:59:54 GMT
	(envelope-from mjacob@repoman.freebsd.org)
Received: (from mjacob@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6P0xsbc067338;
	Tue, 25 Jul 2006 00:59:54 GMT (envelope-from mjacob)
Message-Id: <200607250059.k6P0xsbc067338@repoman.freebsd.org>
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Tue, 25 Jul 2006 00:59:54 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/dev/mpt mpt_cam.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Jul 2006 01:00:39 -0000

mjacob      2006-07-25 00:59:54 UTC

  FreeBSD src repository

  Modified files:
    sys/dev/mpt          mpt_cam.c 
  Log:
  When probing to attach the CAM functionality, check against
  desired role configuration instead of existing role. This gets
  us out of the mess where we configured a role of NONE (or were
  LAN only, for example), but didn't continue to attach the CAM
  module (because we had neither initiator nor target role
  set). Unfortunately, the code that rewrites NVRAM to match
  actual to desired role only works if the CAM module attaches.
  
  MFC after:      2 weeks
  
  Revision  Changes    Path
  1.31      +13 -5     src/sys/dev/mpt/mpt_cam.c