svn commit: r194641 - in head/sys: net sys

[Bjoern A. Zeeb]

Author: bz
Date: Mon Jun 22 17:56:07 2009
New Revision: 194641
URL: http://svn.freebsd.org/changeset/base/194641

Log:
  Updates after r194640:
  - shrink size guards for vnet_net.
    vnet_rtable does not need size guards as it is self-contained.
  - remove a bunch of defines from vnet.h no longer valid.

Modified:
  head/sys/net/vnet.h
  head/sys/sys/vimage.h

Modified: head/sys/net/vnet.h
==============================================================================
--- head/sys/net/vnet.h	Mon Jun 22 17:48:16 2009	(r194640)
+++ head/sys/net/vnet.h	Mon Jun 22 17:56:07 2009	(r194641)
@@ -86,9 +86,5 @@ extern struct vnet_net vnet_net_0;
 #define	V_lo_cloner_data	VNET_NET(lo_cloner_data)
 #define	V_loif			VNET_NET(loif)
 #define	V_rawcb_list		VNET_NET(rawcb_list)
-#define	V_rt_tables		VNET_NET(rt_tables)
-#define	V_rtstat		VNET_NET(rtstat)
-#define	V_rttrash		VNET_NET(rttrash)
-#define	V_rtzone		VNET_NET(rtzone)
 
 #endif /* !_NET_VNET_H_ */

Modified: head/sys/sys/vimage.h
==============================================================================
--- head/sys/sys/vimage.h	Mon Jun 22 17:48:16 2009	(r194640)
+++ head/sys/sys/vimage.h	Mon Jun 22 17:56:07 2009	(r194641)
@@ -369,43 +369,43 @@ extern struct vprocg_list_head vprocg_he
  * See description further down to see how to get the new values.
  */
 #ifdef __amd64__
-#define	SIZEOF_vnet_net		192
+#define	SIZEOF_vnet_net		156
 #define	SIZEOF_vnet_inet	4424
 #define	SIZEOF_vnet_inet6	8808
 #define	SIZEOF_vnet_ipsec	31160
 #endif
 #ifdef __arm__
-#define	SIZEOF_vnet_net		104
+#define	SIZEOF_vnet_net		72
 #define	SIZEOF_vnet_inet	2616
 #define	SIZEOF_vnet_inet6	8524
 #define	SIZEOF_vnet_ipsec	1
 #endif
 #ifdef __i386__ /* incl. pc98 */
-#define	SIZEOF_vnet_net		104
+#define	SIZEOF_vnet_net		72
 #define	SIZEOF_vnet_inet	2612
 #define	SIZEOF_vnet_inet6	8512
 #define	SIZEOF_vnet_ipsec	31024
 #endif
 #ifdef __ia64__
-#define	SIZEOF_vnet_net		192
+#define	SIZEOF_vnet_net		156
 #define	SIZEOF_vnet_inet	4424
 #define	SIZEOF_vnet_inet6	8808
 #define	SIZEOF_vnet_ipsec	31160
 #endif
 #ifdef __mips__
-#define	SIZEOF_vnet_net		104
+#define	SIZEOF_vnet_net		72
 #define	SIZEOF_vnet_inet	2648
 #define	SIZEOF_vnet_inet6	8544
 #define	SIZEOF_vnet_ipsec	1
 #endif
 #ifdef __powerpc__
-#define	SIZEOF_vnet_net		104
+#define	SIZEOF_vnet_net		72
 #define	SIZEOF_vnet_inet	2640
 #define	SIZEOF_vnet_inet6	8520
 #define	SIZEOF_vnet_ipsec	31048
 #endif
 #ifdef __sparc64__ /* incl. sun4v */
-#define	SIZEOF_vnet_net		192
+#define	SIZEOF_vnet_net		156
 #define	SIZEOF_vnet_inet	4424
 #define	SIZEOF_vnet_inet6	8808
 #define	SIZEOF_vnet_ipsec	31160