CVS commit: src/sys/rump/net/lib

[Antti Kantee]

Module Name:    src
Committed By:   pooka
Date:           Wed Aug 14 09:55:05 UTC 2013

Modified Files:
        src/sys/rump/net/lib/libnetinet: component.c
        src/sys/rump/net/lib/libnetinet6: component.c

Log Message:
Partially revert previous, there are still a few gotchas in
running ipv4/ipv6-only (too many dependencies on ifdefs).


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/net/lib/libnetinet/component.c
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/libnetinet6/component.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/rump/net/lib/libnetinet/component.c
diff -u src/sys/rump/net/lib/libnetinet/component.c:1.7 src/sys/rump/net/lib/libnetinet/component.c:1.8
--- src/sys/rump/net/lib/libnetinet/component.c:1.7	Wed Aug 14 09:31:42 2013
+++ src/sys/rump/net/lib/libnetinet/component.c	Wed Aug 14 09:55:05 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: component.c,v 1.7 2013/08/14 09:31:42 pooka Exp $	*/
+/*	$NetBSD: component.c,v 1.8 2013/08/14 09:55:05 pooka Exp $	*/
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.7 2013/08/14 09:31:42 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.8 2013/08/14 09:55:05 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/domain.h>
@@ -46,10 +46,11 @@ int carpattach(int);
 
 RUMP_COMPONENT(RUMP_COMPONENT_NET)
 {
-	extern struct domain arpdomain, inetdomain;
+	extern struct domain arpdomain, inetdomain, inet6domain;
 
 	DOMAINADD(arpdomain);
 	DOMAINADD(inetdomain);
+	DOMAINADD(inet6domain);
 
 	carpattach(1);
 }

Index: src/sys/rump/net/lib/libnetinet6/component.c
diff -u src/sys/rump/net/lib/libnetinet6/component.c:1.1 src/sys/rump/net/lib/libnetinet6/component.c:1.2
--- src/sys/rump/net/lib/libnetinet6/component.c:1.1	Wed Aug 14 09:31:42 2013
+++ src/sys/rump/net/lib/libnetinet6/component.c	Wed Aug 14 09:55:05 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: component.c,v 1.1 2013/08/14 09:31:42 pooka Exp $	*/
+/*	$NetBSD: component.c,v 1.2 2013/08/14 09:55:05 pooka Exp $	*/
 
 /*
  * Copyright (c) 2013 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.1 2013/08/14 09:31:42 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.2 2013/08/14 09:55:05 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/domain.h>
@@ -38,12 +38,14 @@ __KERNEL_RCSID(0, "$NetBSD: component.c,
 #include "rump_private.h"
 #include "rump_net_private.h"
 
+#ifdef notyet
 RUMP_COMPONENT(RUMP_COMPONENT_NET)
 {
 	extern struct domain inet6domain;
 
 	DOMAINADD(inet6domain);
 }
+#endif
 
 RUMP_COMPONENT(RUMP_COMPONENT_NET_IFCFG)
 {