sctp: Fix the RTO-doubling on idle-link heartbeats

[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 6c9a48a..6fc13d9 100644 (file)
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -9,31 +9,42 @@
 #include <linux/list.h>
 
 #include <net/netns/core.h>
+#include <net/netns/mib.h>
 #include <net/netns/unix.h>
 #include <net/netns/packet.h>
 #include <net/netns/ipv4.h>
 #include <net/netns/ipv6.h>
+#include <net/netns/dccp.h>
 #include <net/netns/x_tables.h>
+#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+#include <net/netns/conntrack.h>
+#endif
+#include <net/netns/xfrm.h>
 
 struct proc_dir_entry;
 struct net_device;
 struct sock;
 struct ctl_table_header;
+struct net_generic;
 
 struct net {
        atomic_t                count;          /* To decided when the network
                                                 *  namespace should be freed.
                                                 */
+#ifdef NETNS_REFCNT_DEBUG
        atomic_t                use_count;      /* To track references we
                                                 * destroy on demand
                                                 */
+#endif
        struct list_head        list;           /* list of network namespaces */
        struct work_struct      work;           /* work struct for freeing */
 
        struct proc_dir_entry   *proc_net;
        struct proc_dir_entry   *proc_net_stat;
 
-       struct list_head        sysctl_table_headers;
+#ifdef CONFIG_SYSCTL
+       struct ctl_table_set    sysctls;
+#endif
 
        struct net_device       *loopback_dev;          /* The loopback */
 
@@ -48,23 +59,35 @@ struct net {
        struct sock             *rtnl;                  /* rtnetlink socket */
 
        struct netns_core       core;
+       struct netns_mib        mib;
        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
+#if defined(CONFIG_IP_DCCP) || defined(CONFIG_IP_DCCP_MODULE)
+       struct netns_dccp       dccp;
+#endif
 #ifdef CONFIG_NETFILTER
        struct netns_xt         xt;
+#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+       struct netns_ct         ct;
 #endif
+#endif
+#ifdef CONFIG_XFRM
+       struct netns_xfrm       xfrm;
+#endif
+       struct net_generic      *gen;
 };
 
 
-#ifdef CONFIG_NET
 #include <linux/seq_file_net.h>
 
 /* Init's network namespace */
 extern struct net init_net;
+
+#ifdef CONFIG_NET
 #define INIT_NET_NS(net_ns) .net_ns = &init_net,
 
 extern struct net *copy_net_ns(unsigned long flags, struct net *net_ns);
@@ -86,6 +109,11 @@ extern struct list_head net_namespace_list;
 #ifdef CONFIG_NET_NS
 extern void __put_net(struct net *net);
 
+static inline int net_alive(struct net *net)
+{
+       return net && atomic_read(&net->count);
+}
+
 static inline struct net *get_net(struct net *net)
 {
        atomic_inc(&net->count);
@@ -110,32 +138,54 @@ static inline void put_net(struct net *net)
                __put_net(net);
 }
 
-static inline struct net *hold_net(struct net *net)
+static inline
+int net_eq(const struct net *net1, const struct net *net2)
+{
+       return net1 == net2;
+}
+#else
+
+static inline int net_alive(struct net *net)
+{
+       return 1;
+}
+
+static inline struct net *get_net(struct net *net)
 {
-       atomic_inc(&net->use_count);
        return net;
 }
 
-static inline void release_net(struct net *net)
+static inline void put_net(struct net *net)
+{
+}
+
+static inline struct net *maybe_get_net(struct net *net)
 {
-       atomic_dec(&net->use_count);
+       return net;
 }
 
 static inline
 int net_eq(const struct net *net1, const struct net *net2)
 {
-       return net1 == net2;
+       return 1;
 }
-#else
-static inline struct net *get_net(struct net *net)
+#endif
+
+
+#ifdef NETNS_REFCNT_DEBUG
+static inline struct net *hold_net(struct net *net)
 {
+       if (net)
+               atomic_inc(&net->use_count);
        return net;
 }
 
-static inline void put_net(struct net *net)
+static inline void release_net(struct net *net)
 {
+       if (net)
+               atomic_dec(&net->use_count);
 }
-
+#else
 static inline struct net *hold_net(struct net *net)
 {
        return net;
@@ -144,17 +194,25 @@ static inline struct net *hold_net(struct net *net)
 static inline void release_net(struct net *net)
 {
 }
+#endif
 
-static inline struct net *maybe_get_net(struct net *net)
+#ifdef CONFIG_NET_NS
+
+static inline void write_pnet(struct net **pnet, struct net *net)
 {
-       return net;
+       *pnet = net;
 }
 
-static inline
-int net_eq(const struct net *net1, const struct net *net2)
+static inline struct net *read_pnet(struct net * const *pnet)
 {
-       return 1;
+       return *pnet;
 }
+
+#else
+
+#define write_pnet(pnet, net)  do { (void)(net);} while (0)
+#define read_pnet(pnet)                (&init_net)
+
 #endif
 
 #define for_each_net(VAR)                              \
@@ -178,14 +236,21 @@ struct pernet_operations {
 
 extern int register_pernet_subsys(struct pernet_operations *);
 extern void unregister_pernet_subsys(struct pernet_operations *);
+extern int register_pernet_gen_subsys(int *id, struct pernet_operations *);
+extern void unregister_pernet_gen_subsys(int id, struct pernet_operations *);
 extern int register_pernet_device(struct pernet_operations *);
 extern void unregister_pernet_device(struct pernet_operations *);
+extern int register_pernet_gen_device(int *id, struct pernet_operations *);
+extern void unregister_pernet_gen_device(int id, struct pernet_operations *);
 
 struct ctl_path;
 struct ctl_table;
 struct ctl_table_header;
+
 extern struct ctl_table_header *register_net_sysctl_table(struct net *net,
        const struct ctl_path *path, struct ctl_table *table);
+extern struct ctl_table_header *register_net_sysctl_rotable(
+       const struct ctl_path *path, struct ctl_table *table);
 extern void unregister_net_sysctl_table(struct ctl_table_header *header);
 
 #endif /* __NET_NET_NAMESPACE_H */