Date: Wed, 18 Jul 2007 15:04:55 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 123692 for review Message-ID: <200707181504.l6IF4tYW020762@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=123692 Change 123692 by zec@zec_tca51 on 2007/07/18 15:04:14 Change the VNET_SYMMAP() macro so that it no longer relies on presence of per-module vnet_foo_0 structs. Staticize per-module vnet_foo_0 structs. Affected files ... .. //depot/projects/vimage/src/sys/net/vnet.h#6 edit .. //depot/projects/vimage/src/sys/netinet/ip_input.c#16 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#17 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#14 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#9 edit .. //depot/projects/vimage/src/sys/netipsec/vipsec.h#5 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#23 edit Differences ... ==== //depot/projects/vimage/src/sys/net/vnet.h#6 (text+ko) ==== @@ -67,8 +67,6 @@ int _ether_ipfw; }; -extern struct vnet_net vnet_net_0; - #endif /* ==== //depot/projects/vimage/src/sys/netinet/ip_input.c#16 (text+ko) ==== @@ -213,7 +213,7 @@ static void ip_freef(struct ipqhead *, struct ipq *); #ifdef VIMAGE -struct vnet_inet vnet_inet_0; +static struct vnet_inet vnet_inet_0; struct vnet_symmap vnet_inet_symmap[] = { VNET_SYMMAP_END ==== //depot/projects/vimage/src/sys/netinet/vinet.h#17 (text+ko) ==== @@ -176,8 +176,6 @@ int _ipport_tcpallocs; int _ipport_tcplastcount; }; - -extern struct vnet_inet vnet_inet_0; #endif ==== //depot/projects/vimage/src/sys/netinet6/ip6_input.c#14 (text+ko) ==== @@ -146,7 +146,7 @@ #endif #ifdef VIMAGE -struct vnet_inet6 vnet_inet6_0; +static struct vnet_inet6 vnet_inet6_0; struct vnet_symmap vnet_inet6_symmap[] = { VNET_SYMMAP_END ==== //depot/projects/vimage/src/sys/netipsec/ipsec.c#9 (text+ko) ==== @@ -224,7 +224,7 @@ #endif /* INET6 */ #ifdef VIMAGE -struct vnet_ipsec vnet_ipsec_0; +static struct vnet_ipsec vnet_ipsec_0; struct vnet_symmap vnet_ipsec_symmap[] = { VNET_SYMMAP_END ==== //depot/projects/vimage/src/sys/netipsec/vipsec.h#5 (text+ko) ==== @@ -108,9 +108,6 @@ int _ipcomp_enable; struct ipcompstat _ipcompstat; }; - -extern struct vnet_ipsec vnet_ipsec_0; - #endif /* ==== //depot/projects/vimage/src/sys/sys/vimage.h#23 (text+ko) ==== @@ -140,7 +140,7 @@ #define VNET_SYMMAP(mod, name) \ { #name, offsetof(struct vnet_##mod, _##name), \ - sizeof((vnet_##mod##_0)._##name) } + sizeof(((struct vnet_##mod *) curthread)->_##name) } #define VNET_SYMMAP_END \ { NULL, 0 }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200707181504.l6IF4tYW020762>