---

yaml --- r: 78724 b: refs/heads/master c: b0f159d h: refs/heads/master v: v3
git-mirror · Jan 28, 2008 · 194afae · 194afae
1 parent c5da934
commit 194afae
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81c1c17804ac52036e07b0ba95cb637bdd4784d6
+refs/heads/master: b0f159db7c95babf1e321334eb33d42db94f2854
diff --git a/trunk/include/net/net_namespace.h b/trunk/include/net/net_namespace.h
@@ -11,6 +11,7 @@
 #include <net/netns/unix.h>
 #include <net/netns/packet.h>
 #include <net/netns/ipv4.h>
+#include <net/netns/ipv6.h>
 
 struct proc_dir_entry;
 struct net_device;
@@ -48,6 +49,9 @@ struct net {
 	struct netns_packet	packet;
 	struct netns_unix	unx;
 	struct netns_ipv4	ipv4;
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+	struct netns_ipv6	ipv6;
+#endif
 };
 
 #ifdef CONFIG_NET

diff --git a/trunk/include/net/netns/ipv6.h b/trunk/include/net/netns/ipv6.h
@@ -0,0 +1,10 @@
+/*
+ * ipv6 in net namespaces
+ */
+
+#ifndef __NETNS_IPV6_H__
+#define __NETNS_IPV6_H__
+
+struct netns_ipv6 {
+};
+#endif