From owner-p4-projects@FreeBSD.ORG  Thu Feb  7 14:30:24 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E222C16A52F; Thu,  7 Feb 2008 14:30:23 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 47B9216A421
	for <perforce@FreeBSD.org>; Thu,  7 Feb 2008 14:30:23 +0000 (UTC)
	(envelope-from swise@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2D4A613C465
	for <perforce@FreeBSD.org>; Thu,  7 Feb 2008 14:30:23 +0000 (UTC)
	(envelope-from swise@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m17EUN9H076448
	for <perforce@FreeBSD.org>; Thu, 7 Feb 2008 14:30:23 GMT
	(envelope-from swise@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m17EUNGL076445
	for perforce@freebsd.org; Thu, 7 Feb 2008 14:30:23 GMT
	(envelope-from swise@FreeBSD.org)
Date: Thu, 7 Feb 2008 14:30:23 GMT
Message-Id: <200802071430.m17EUNGL076445@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	swise@FreeBSD.org using -f
From: Steve Wise <swise@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 134987 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, 07 Feb 2008 14:30:24 -0000

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

Change 134987 by swise@swise:vic10:iwarp on 2008/02/07 14:29:44

	Fixed cxgbtool breakage after integration/syncing.

Affected files ...

.. //depot/projects/iwarp/usr.sbin/cxgbtool/cxgbtool.c#6 edit

Differences ...

==== //depot/projects/iwarp/usr.sbin/cxgbtool/cxgbtool.c#6 (text+ko) ====

@@ -868,17 +868,17 @@
 	op = malloc(sizeof(*op));
 	if (!op)
 		err(1, "get TCB");
-	memset(op.buf, 0xaa, TCB_SIZE);
 
 	op->mem_id = MEM_CM;
 	op->addr   = tcb_idx * TCB_SIZE;
 	op->len    = TCB_SIZE;
 	op->buf	   = buf;
 	
+	memset(op->buf, 0xaa, TCB_SIZE);
 	if (doit(iff_name, CHELSIO_GET_MEM, op) < 0) 
 		err(1, "get TCB");
 	
-	for (d = (uint64_t *)op.buf, i = 0; i < TCB_SIZE / 32; i++) {
+	for (d = (uint64_t *)op->buf, i = 0; i < TCB_SIZE / 32; i++) {
 		printf("%2u:", i);
 		printf(" %08x %08x %08x %08x", (uint32_t)d[1],
 		       (uint32_t)(d[1] >> 32), (uint32_t)d[0],
@@ -889,7 +889,7 @@
 		       (uint32_t)(d[0] >> 32));
 		d += 2;
 	}
-	free(op.buf);
+	free(op);
 	return 0;
 }
 
@@ -1875,7 +1875,6 @@
 #endif	
 	else if (!strcmp(argv[2], "tcb"))
 		r = get_tcb(argc, argv, 3, iff_name);
-#ifdef notyet
 #ifdef WRC
 	else if (!strcmp(argv[2], "wrc")) 
 		r = get_wrc(argc, argv, 3, iff_name);