From owner-p4-projects@FreeBSD.ORG  Tue Jul 14 17:23:03 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 291CE1065678; Tue, 14 Jul 2009 17:23:03 +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 D744E1065674
	for <perforce@freebsd.org>; Tue, 14 Jul 2009 17:23:02 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C48F98FC1E
	for <perforce@freebsd.org>; Tue, 14 Jul 2009 17:23:02 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6EHN2PQ021499
	for <perforce@freebsd.org>; Tue, 14 Jul 2009 17:23:02 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6EHN2wC021497
	for perforce@freebsd.org; Tue, 14 Jul 2009 17:23:02 GMT
	(envelope-from trasz@freebsd.org)
Date: Tue, 14 Jul 2009 17:23:02 GMT
Message-Id: <200907141723.n6EHN2wC021497@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 166087 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: Tue, 14 Jul 2009 17:23:04 -0000

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

Change 166087 by trasz@trasz_victim on 2009/07/14 17:22:43

	IFC.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/mklocale/yacc.y#2 integrate

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#16 (text+ko) ====

@@ -28,7 +28,7 @@
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.33 2009/07/13 11:51:02 lstewart Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.34 2009/07/14 11:53:21 lstewart Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -3585,7 +3585,7 @@
 {
 
 	struct in_conninfo inc;
-	struct toeopt to;
+	struct toeopt toeo;
 	struct tcphdr th;
 	int mss, wsf, sack, ts;
 	struct mbuf *m = NULL;

==== //depot/projects/soc2008/trasz_nfs4acl/usr.bin/mklocale/yacc.y#2 (text+ko) ====

@@ -42,7 +42,7 @@
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/mklocale/yacc.y,v 1.28 2008/01/22 00:04:50 ache Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/mklocale/yacc.y,v 1.29 2009/07/14 09:19:33 ed Exp $");
 
 #include <arpa/inet.h>
 
@@ -730,8 +730,8 @@
     /*
      * PART 6: And finally the variable data
      */
-    if (fwrite(variable,
-	       ntohl(new_locale.variable_len), 1, fp) != 1) {
+    if (new_locale.variable_len != 0 &&
+	fwrite(variable, ntohl(new_locale.variable_len), 1, fp) != 1) {
 	perror(locale_file);
 	exit(1);
     }