From owner-p4-projects@FreeBSD.ORG  Tue Sep 30 22:01:32 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 49F8F1065694; Tue, 30 Sep 2008 22:01:32 +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 0E4A81065691
	for <perforce@freebsd.org>; Tue, 30 Sep 2008 22:01:32 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F12D48FC34
	for <perforce@freebsd.org>; Tue, 30 Sep 2008 22:01:31 +0000 (UTC)
	(envelope-from julian@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 m8UM1VrU092926
	for <perforce@freebsd.org>; Tue, 30 Sep 2008 22:01:31 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8UM1VMu092904
	for perforce@freebsd.org; Tue, 30 Sep 2008 22:01:31 GMT
	(envelope-from julian@freebsd.org)
Date: Tue, 30 Sep 2008 22:01:31 GMT
Message-Id: <200809302201.m8UM1VMu092904@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 150729 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, 30 Sep 2008 22:01:32 -0000

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

Change 150729 by julian@julian_trafmon1 on 2008/09/30 22:00:56

	Fix apparent mismerge

Affected files ...

.. //depot/projects/vimage/src/sys/netgraph/netgraph.h#12 edit

Differences ...

==== //depot/projects/vimage/src/sys/netgraph/netgraph.h#12 (text+ko) ====

@@ -1187,7 +1187,8 @@
 #define	ng_copy_meta(meta) NULL
 
 /* Hash related definitions */
-#define	NG_ID_HASH_SIZE 128 /* most systems wont need even this many */
+#define NG_ID_HASH_SIZE 32 /* most systems wont need even this many */
+#define NG_NAME_HASH_SIZE 128 /* most systems wont need even this many */
 
 /* Virtualization macros */
 #define	INIT_VNET_NETGRAPH(vnet) \
@@ -1196,6 +1197,18 @@
 
 #define	VNET_NETGRAPH(sym)	VSYM(vnet_netgraph, sym)
 
+#ifdef VIMAGE
+struct vnet_netgraph {
+	LIST_HEAD(, ng_node) _ng_ID_hash[NG_ID_HASH_SIZE];
+	LIST_HEAD(, ng_node) _ng_name_hash[NG_NAME_HASH_SIZE];
+	LIST_HEAD(, ng_node) _ng_nodelist;
+	ng_ID_t		_nextID;
+	struct unrhdr	*_ng_iface_unit;
+	struct unrhdr	*_ng_eiface_unit;
+	struct unrhdr	*_ng_wormhole_unit;
+};
+#endif
+
 /* Symbol translation macros */
 #define	V_nextID		VNET_NETGRAPH(nextID)
 #define	V_ng_ID_hash		VNET_NETGRAPH(ng_ID_hash)