PERFORCE change 154492 for review
Bjoern A. Zeeb
bz at FreeBSD.org
Thu Dec 11 04:56:59 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=154492
Change 154492 by bz at bz_dumpster on 2008/12/11 12:56:30
Diff reduction to SVN.
Sponsored by: The FreeBSD Foundation
Affected files ...
.. //depot/projects/vimage/src/sys/netgraph/ng_base.c#47 edit
.. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#22 edit
.. //depot/projects/vimage/src/sys/netinet/in_gif.c#18 edit
.. //depot/projects/vimage/src/sys/netinet/in_gif.h#5 edit
.. //depot/projects/vimage/src/sys/netinet/in_pcb.h#23 edit
.. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#58 edit
.. //depot/projects/vimage/src/sys/netinet/ip_fw_nat.c#11 edit
.. //depot/projects/vimage/src/sys/netinet/ip_fw_pfil.c#16 edit
.. //depot/projects/vimage/src/sys/netipsec/ipsec.c#35 edit
.. //depot/projects/vimage/src/sys/netipsec/xform_tcp.c#4 edit
.. //depot/projects/vimage/src/sys/nfsclient/bootp_subr.c#13 edit
Differences ...
==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#47 (text+ko) ====
@@ -175,10 +175,8 @@
/* XXX Don't need to initialise them because it's a LIST */
#ifdef VIMAGE_GLOBALS
static LIST_HEAD(, ng_node) ng_ID_hash[NG_ID_HASH_SIZE];
-static LIST_HEAD(, ng_node) ng_name_hash[NG_NAME_HASH_SIZE];
#endif
static struct mtx ng_idhash_mtx;
-static struct mtx ng_namehash_mtx;
/* Method to find a node.. used twice so do it here */
#define NG_IDHASH_FN(ID) ((ID) % (NG_ID_HASH_SIZE))
#define NG_IDHASH_FIND(ID, node) \
@@ -193,6 +191,10 @@
} \
} while (0)
+#ifdef VIMAGE_GLOBALS
+static LIST_HEAD(, ng_node) ng_name_hash[NG_NAME_HASH_SIZE];
+#endif
+static struct mtx ng_namehash_mtx;
#define NG_NAMEHASH(NAME, HASH) \
do { \
u_char h = 0; \
==== //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#22 (text+ko) ====
@@ -116,7 +116,7 @@
static vnet_attach_fn ng_eiface_iattach;
static vnet_detach_fn ng_eiface_idetach;
-#ifndef VIMAGE
+#ifdef VIMAGE_GLOBALS
static struct unrhdr *ng_eiface_unit;
#endif
==== //depot/projects/vimage/src/sys/netinet/in_gif.c#18 (text+ko) ====
@@ -86,6 +86,9 @@
.pr_usrreqs = &rip_usrreqs
};
+#ifdef VIMAGE_GLOBALS
+extern int ip_gif_ttl;
+#endif
SYSCTL_V_INT(V_NET, vnet_gif, _net_inet_ip, IPCTL_GIF_TTL, gifttl,
CTLFLAG_RW, ip_gif_ttl, 0, "");
==== //depot/projects/vimage/src/sys/netinet/in_gif.h#5 (text+ko) ====
@@ -35,9 +35,6 @@
#define GIF_TTL 30
-#ifdef VIMAGE_GLOBALS
-extern int ip_gif_ttl;
-#endif
struct gif_softc;
void in_gif_input(struct mbuf *, int);
int in_gif_output(struct ifnet *, int, struct mbuf *);
==== //depot/projects/vimage/src/sys/netinet/in_pcb.h#23 (text+ko) ====
==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#58 (text+ko) ====
@@ -110,6 +110,12 @@
#include <security/mac/mac_framework.h>
+#ifndef VIMAGE
+#ifndef VIMAGE_GLOBALS
+struct vnet_ipfw vnet_ipfw_0;
+#endif
+#endif
+
static int vnet_ipfw_iattach(const void *);
static int vnet_ipfw_idetach(const void *);
@@ -242,7 +248,6 @@
static u_int32_t dyn_rst_lifetime;
static u_int32_t dyn_udp_lifetime;
static u_int32_t dyn_short_lifetime;
-#endif
/*
* Keepalives are sent if dyn_keepalive is set. They are sent every
@@ -251,7 +256,6 @@
* dyn_rst_lifetime and dyn_fin_lifetime should be strictly lower
* than dyn_keepalive_period.
*/
-#ifdef VIMAGE_GLOBALS
static u_int32_t dyn_keepalive_interval;
static u_int32_t dyn_keepalive_period;
==== //depot/projects/vimage/src/sys/netinet/ip_fw_nat.c#11 (text+ko) ====
==== //depot/projects/vimage/src/sys/netinet/ip_fw_pfil.c#16 (text+ko) ====
==== //depot/projects/vimage/src/sys/netipsec/ipsec.c#35 (text+ko) ====
@@ -97,6 +97,12 @@
#include <opencrypto/cryptodev.h>
+#ifndef VIMAGE
+#ifndef VIMAGE_GLOBALS
+struct vnet_ipsec vnet_ipsec_0;
+#endif
+#endif
+
static int vnet_ipsec_iattach(const void *);
#ifdef VIMAGE
static int vnet_ipsec_idetach(const void *);
==== //depot/projects/vimage/src/sys/netipsec/xform_tcp.c#4 (text+ko) ====
@@ -82,7 +82,6 @@
static int
tcpsignature_init(struct secasvar *sav, struct xformsw *xsp)
{
- INIT_VNET_IPSEC(curvnet);
int keylen;
if (sav->spi != htonl(TCP_SIG_SPI)) {
==== //depot/projects/vimage/src/sys/nfsclient/bootp_subr.c#13 (text+ko) ====
More information about the p4-projects
mailing list