PERFORCE change 147547 for review

[Dag-Erling Smorgrav]

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

Change 147547 by des at des.at.des.no on 2008/08/16 15:08:04

	Correct a comment + __FreeBSD_version check

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#4 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#10 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#4 (text+ko) ====

@@ -34,7 +34,9 @@
 #define	_NETINET_IP_VAR_H_
 
 #include <sys/queue.h>
+#ifdef _KERNEL
 #include <sys/vimage.h>
+#endif
 
 /*
  * Overlay for ip header used by other protocols (tcp, udp).

==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#10 (text+ko) ====

@@ -145,8 +145,7 @@
 /*
  * Macros to expand out globals defined by various modules
  * to either a real global or a virtualized instance of one,
- * depending on whether VIMAGE is defined in opt_global.h
- * XXX so will always evaluate to the global for now (VIMAGE not defined)
+ * depending on whether VIMAGE is defined.
  */
 /* first define modules that supply us information */
 #define MOD_NET net
@@ -155,7 +154,7 @@
 #define MOD_IPSEC ipsec
 
 /* then define the macro(s) that hook into the vimage macros */
-#if defined(__FreeBSD__) && __FreeBSD_version > 800000 && defined(VIMAGE)
+#if defined(__FreeBSD__) && __FreeBSD_version >= 800044 && defined(VIMAGE)
 #define VSYMNAME(__MODULE) vnet_ ## __MODULE
 #define MODULE_GLOBAL(__MODULE, __SYMBOL) VSYM(VSYMNAME(__MODULE), __SYMBOL)
 #else