From owner-p4-projects@FreeBSD.ORG  Thu Nov  2 23:41:38 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3AE2716A415; Thu,  2 Nov 2006 23:41:38 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 109D416A407
	for <perforce@freebsd.org>; Thu,  2 Nov 2006 23:41:38 +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 DE15243D5F
	for <perforce@freebsd.org>; Thu,  2 Nov 2006 23:41:36 +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 kA2NfaIV093542
	for <perforce@freebsd.org>; Thu, 2 Nov 2006 23:41:36 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA2Nfav6093539
	for perforce@freebsd.org; Thu, 2 Nov 2006 23:41:36 GMT
	(envelope-from mjacob@freebsd.org)
Date: Thu, 2 Nov 2006 23:41:36 GMT
Message-Id: <200611022341.kA2Nfav6093539@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109082 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Nov 2006 23:41:38 -0000

http://perforce.freebsd.org/chv.cgi?CH=109082

Change 109082 by mjacob@newisp on 2006/11/02 23:40:47

	Only compare 36 bytes of inquiry data for Domain Validation
	purposes. We still alloc and fetch for the whole N bytes.

Affected files ...

.. //depot/projects/newisp/cam/cam_xpt.c#9 edit

Differences ...

==== //depot/projects/newisp/cam/cam_xpt.c#9 (text+ko) ====

@@ -6270,7 +6270,6 @@
 	{
 		struct scsi_inquiry_data *nbuf;
 		struct ccb_scsiio *csio;
-		int iqlen = SID_ADDITIONAL_LENGTH(&path->device->inq_data);
 
 		if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
 			/* Don't wedge the queue */
@@ -6279,7 +6278,7 @@
 		}
 		csio = &done_ccb->csio;
 		nbuf = (struct scsi_inquiry_data *)csio->data_ptr;
-		if (bcmp(nbuf, &path->device->inq_data, iqlen) != 0) {
+		if (bcmp(nbuf, &path->device->inq_data, SHORT_INQUIRY_LENGTH)) {
 			xpt_print_path(path);
 			printf("inquiry fails comparison at DV%d step\n",
 			    softc->action == PROBE_INQUIRY_BASIC_DV1? 1 : 2);