[IPSEC]: Add ICMP host relookup support

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

diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index b0cf075..18da0af 100644 (file)
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -8,9 +8,14 @@
 #include <linux/workqueue.h>
 #include <linux/list.h>
 
+#include <net/netns/unix.h>
+#include <net/netns/packet.h>
+
 struct proc_dir_entry;
 struct net_device;
 struct sock;
+struct ctl_table_header;
+
 struct net {
        atomic_t                count;          /* To decided when the network
                                                 *  namespace should be freed.
@@ -35,12 +40,12 @@ struct net {
 
        struct sock             *rtnl;                  /* rtnetlink socket */
 
-       /* List of all packet sockets. */
-       rwlock_t                packet_sklist_lock;
-       struct hlist_head       packet_sklist;
+       /* core sysctls */
+       struct ctl_table_header *sysctl_core_hdr;
+       int                     sysctl_somaxconn;
 
-       /* unix sockets */
-       int                     sysctl_unix_max_dgram_qlen;
+       struct netns_packet     packet;
+       struct netns_unix       unx;
 };
 
 #ifdef CONFIG_NET