PERFORCE change 145648 for review

[Marko Zec]

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

Change 145648 by zec at 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