[NETFILTER]: x_tables: per-netns xt_tables

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

diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index d04ddf2f80da18884222da81a24ab57fa003e8ad..28738b7d53eb2a0748cecad1076a9726da8d936f 100644 (file)
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -11,6 +11,8 @@
 #include <net/netns/unix.h>
 #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;
@@ -39,6 +41,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 */
@@ -48,6 +54,12 @@ 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_NETFILTER
+       struct netns_xt         xt;
+#endif
 };
 
 #ifdef CONFIG_NET