From owner-p4-projects@FreeBSD.ORG  Tue Jul 22 18:39:55 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BB2451065676; Tue, 22 Jul 2008 18:39:54 +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 7CE911065672
	for <perforce@freebsd.org>; Tue, 22 Jul 2008 18:39:54 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 739E88FC0A
	for <perforce@freebsd.org>; Tue, 22 Jul 2008 18:39:54 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m6MIdsRw013354
	for <perforce@freebsd.org>; Tue, 22 Jul 2008 18:39:54 GMT
	(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6MIdrcT013350
	for perforce@freebsd.org; Tue, 22 Jul 2008 18:39:53 GMT
	(envelope-from zec@tel.fer.hr)
Date: Tue, 22 Jul 2008 18:39:53 GMT
Message-Id: <200807221839.m6MIdrcT013350@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@tel.fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 145648 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: Tue, 22 Jul 2008 18:39:55 -0000

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

Change 145648 by zec@zec_tinderbox on 2008/07/22 18:39:18

	Unbreak LINT + nooptions INET6 build.

Affected files ...

.. //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#6 edit
.. //depot/projects/vimage/src/sys/dev/lmc/if_lmc.c#5 edit

Differences ...

==== //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#6 (text+ko) ====

@@ -58,10 +58,10 @@
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
+#include <netinet6/vinet6.h>
 #ifdef INET6
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
-#include <netinet6/vinet6.h>
 #endif
 
 #ifdef COMPAT_LINUX32
@@ -550,9 +550,7 @@
 static int
 linux_socket(struct thread *td, struct linux_socket_args *args)
 {
-#ifndef KLD_MODULE
 	INIT_VNET_INET6(curvnet);
-#endif
 
 	struct linux_socket_args linux_args;
 	struct socket_args /* {
@@ -592,13 +590,7 @@
 	 * for Linux apps if the sysctl value is set to 1.
 	 */
 	if (bsd_args.domain == PF_INET6 && retval_socket >= 0
-#ifndef KLD_MODULE
-	    /*
-	     * XXX: Avoid undefined symbol error with an IPv4 only
-	     * kernel.
-	     */
 	    && V_ip6_v6only
-#endif
 	    ) {
 		int v6only;
 

==== //depot/projects/vimage/src/sys/dev/lmc/if_lmc.c#5 (text+ko) ====

@@ -80,6 +80,9 @@
 # ifdef HAVE_KERNEL_OPTION_HEADERS
 # include "opt_device_polling.h" /* DEVICE_POLLING */
 # endif
+# ifndef INET6
+#  define INET6 0
+# endif
 # ifndef NETGRAPH
 #  define NETGRAPH 0
 # endif