From owner-svn-src-stable@FreeBSD.ORG  Mon Dec  1 20:33:23 2008
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 29A201065678;
	Mon,  1 Dec 2008 20:33:23 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 12E5D8FC2A;
	Mon,  1 Dec 2008 20:33:23 +0000 (UTC)
	(envelope-from marius@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 mB1KXMgi036482;
	Mon, 1 Dec 2008 20:33:22 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mB1KXMul036481;
	Mon, 1 Dec 2008 20:33:22 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <200812012033.mB1KXMul036481@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 1 Dec 2008 20:33:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185530 - stable/6/lib/libcam
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: Mon, 01 Dec 2008 20:33:23 -0000

Author: marius
Date: Mon Dec  1 20:33:22 2008
New Revision: 185530
URL: http://svn.freebsd.org/changeset/base/185530

Log:
  MFC: r184379
  
  Supply a valid Connect ID when issuing XPT_DEV_MATCH.
  
  PR:		127605

Modified:
  stable/6/lib/libcam/   (props changed)
  stable/6/lib/libcam/camlib.c

Modified: stable/6/lib/libcam/camlib.c
==============================================================================
--- stable/6/lib/libcam/camlib.c	Mon Dec  1 20:16:56 2008	(r185529)
+++ stable/6/lib/libcam/camlib.c	Mon Dec  1 20:33:22 2008	(r185530)
@@ -346,6 +346,9 @@ cam_open_btl(path_id_t path_id, target_i
 
 	bzero(&ccb, sizeof(union ccb));
 	ccb.ccb_h.func_code = XPT_DEV_MATCH;
+	ccb.ccb_h.path_id = CAM_XPT_PATH_ID;
+	ccb.ccb_h.target_id = CAM_TARGET_WILDCARD;
+	ccb.ccb_h.target_lun = CAM_LUN_WILDCARD;
 
 	/* Setup the result buffer */
 	bufsize = sizeof(struct dev_match_result);