From owner-p4-projects@FreeBSD.ORG  Thu Jun 11 21:19: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 E68DA1065675; Thu, 11 Jun 2009 21:19:02 +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 A2674106566B
	for <perforce@freebsd.org>; Thu, 11 Jun 2009 21:19:02 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 76A758FC14
	for <perforce@freebsd.org>; Thu, 11 Jun 2009 21:19:02 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5BLIwDY040597
	for <perforce@freebsd.org>; Thu, 11 Jun 2009 21:18:58 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5BLItiP040592
	for perforce@freebsd.org; Thu, 11 Jun 2009 21:18:55 GMT
	(envelope-from zec@fer.hr)
Date: Thu, 11 Jun 2009 21:18:55 GMT
Message-Id: <200906112118.n5BLItiP040592@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 164147 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, 11 Jun 2009 21:19:04 -0000

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

Change 164147 by zec@zec_amdx4 on 2009/06/11 21:18:49

	Fix a misintegration.

Affected files ...

.. //depot/projects/vimage/src/sys/netinet/ip_fw.h#34 edit

Differences ...

==== //depot/projects/vimage/src/sys/netinet/ip_fw.h#34 (text+ko) ====

@@ -601,6 +601,7 @@
 	LIST_HEAD(, cfg_nat) nat;	/* list of nat entries */
 	struct radix_node_head *tables[IPFW_TABLES_MAX];
 	struct rwlock	rwmtx;
+	uint32_t	id;		/* ruleset id */
 };
 
 struct table_entry {
@@ -688,9 +689,6 @@
 #endif
 #endif
 
-	uint32_t	id;		/* ruleset id */
-};
-
 #ifdef IPFW_INTERNAL
 
 #define	IPFW_LOCK_INIT(_chain) \