From owner-p4-projects@FreeBSD.ORG  Sat Aug 16 15:08:58 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 638821065681; Sat, 16 Aug 2008 15:08:58 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 274C61065676
	for <perforce@freebsd.org>; Sat, 16 Aug 2008 15:08:58 +0000 (UTC)
	(envelope-from des@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0EEDF8FC1A
	for <perforce@freebsd.org>; Sat, 16 Aug 2008 15:08:58 +0000 (UTC)
	(envelope-from des@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GF8vng027295
	for <perforce@freebsd.org>; Sat, 16 Aug 2008 15:08:57 GMT
	(envelope-from des@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GF8vAi027293
	for perforce@freebsd.org; Sat, 16 Aug 2008 15:08:57 GMT
	(envelope-from des@freebsd.org)
Date: Sat, 16 Aug 2008 15:08:57 GMT
Message-Id: <200808161508.m7GF8vAi027293@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	des@freebsd.org using -f
From: Dag-Erling Smorgrav <des@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 147547 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Aug 2008 15:08:58 -0000

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

Change 147547 by des@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