Date: Tue, 30 Sep 2008 22:01:31 GMT From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 150729 for review Message-ID: <200809302201.m8UM1VMu092904@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809302201.m8UM1VMu092904>