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 d5936115d97230c2a39009bbd269fd33827b4868..923f2b8b909600b3962035f714308ddc5e8acf9d 100644 (file)
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -8,6 +8,12 @@
 #include <linux/workqueue.h>
 #include <linux/list.h>
 
+#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;
 struct sock;
@@ -25,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;
 
@@ -35,18 +40,25 @@ 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 */
        struct ctl_table_header *sysctl_core_hdr;
+       int                     sysctl_somaxconn;
 
-       /* List of all packet sockets. */
-       rwlock_t                packet_sklist_lock;
-       struct hlist_head       packet_sklist;
-
-       /* unix sockets */
-       int                     sysctl_unix_max_dgram_qlen;
-       struct ctl_table_header *unix_ctl;
+       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