Merge branch 'smsc47b397-new-id' into release

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

diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index b0a5f904d252bdfe1ae394987d951fccd25cb28c..923f2b8b909600b3962035f714308ddc5e8acf9d 100644 (file)
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -12,6 +12,7 @@
 #include <net/netns/packet.h>
 #include <net/netns/ipv4.h>
 #include <net/netns/ipv6.h>
+#include <net/netns/x_tables.h>
 
 struct proc_dir_entry;
 struct net_device;
@@ -30,7 +31,6 @@ struct net {
 
        struct proc_dir_entry   *proc_net;
        struct proc_dir_entry   *proc_net_stat;
-       struct proc_dir_entry   *proc_net_root;
 
        struct list_head        sysctl_table_headers;
 
@@ -40,6 +40,10 @@ struct net {
        struct hlist_head       *dev_name_head;
        struct hlist_head       *dev_index_head;
 
+       /* core fib_rules */
+       struct list_head        rules_ops;
+       spinlock_t              rules_mod_lock;
+
        struct sock             *rtnl;                  /* rtnetlink socket */
 
        /* core sysctls */
@@ -52,6 +56,9 @@ struct net {
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
        struct netns_ipv6       ipv6;
 #endif
+#ifdef CONFIG_NETFILTER
+       struct netns_xt         xt;
+#endif
 };
 
 #ifdef CONFIG_NET