From 194afae498c174e2b135a58a3f20a318ce4d03ce Mon Sep 17 00:00:00 2001
From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Thu, 10 Jan 2008 02:49:06 -0800
Subject: [PATCH] --- yaml --- r: 78724 b: refs/heads/master c:
 b0f159db7c95babf1e321334eb33d42db94f2854 h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/include/net/net_namespace.h |  4 ++++
 trunk/include/net/netns/ipv6.h    | 10 ++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 trunk/include/net/netns/ipv6.h

diff --git a/[refs] b/[refs]
index ac47eebcaade..f0ece0a74574 100644
--- 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
index d04ddf2f80da..b0a5f904d252 100644
--- 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
new file mode 100644
index 000000000000..6f82046e3013
--- /dev/null
+++ 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