Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[linux-2.6-block.git] / include / net / net_namespace.h

diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index e0d64667a4b3e3be0cb9f70d45f02988fc19b21f..2e8756b8c77543391b1c3381fa442c2a2a1c582e 100644 (file)
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -26,6 +26,7 @@
 #endif
 #include <net/netns/nftables.h>
 #include <net/netns/xfrm.h>
+#include <linux/ns_common.h>
 
 struct user_namespace;
 struct proc_dir_entry;
@@ -60,7 +61,7 @@ struct net {
 
        struct user_namespace   *user_ns;       /* Owning user namespace */
 
-       unsigned int            proc_inum;
+       struct ns_common        ns;
 
        struct proc_dir_entry   *proc_net;
        struct proc_dir_entry   *proc_net_stat;