Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[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 6344b77..1fd449a 100644 (file)
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -8,6 +8,8 @@
 #include <linux/workqueue.h>
 #include <linux/list.h>
 
+struct proc_dir_entry;
+struct net_device;
 struct net {
        atomic_t                count;          /* To decided when the network
                                                 *  namespace should be freed.
@@ -17,11 +19,39 @@ struct net {
                                                 */
        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 proc_dir_entry   *proc_net_root;
+
+       struct net_device       *loopback_dev;          /* The loopback */
+
+       struct list_head        dev_base_head;
+       struct hlist_head       *dev_name_head;
+       struct hlist_head       *dev_index_head;
 };
 
+#ifdef CONFIG_NET
+/* Init's network namespace */
 extern struct net init_net;
+#define INIT_NET_NS(net_ns) .net_ns = &init_net,
+#else
+#define INIT_NET_NS(net_ns)
+#endif
+
 extern struct list_head net_namespace_list;
 
+#ifdef CONFIG_NET
+extern struct net *copy_net_ns(unsigned long flags, struct net *net_ns);
+#else
+static inline struct net *copy_net_ns(unsigned long flags, struct net *net_ns)
+{
+       /* There is nothing to copy so this is a noop */
+       return net_ns;
+}
+#endif
+
+#ifdef CONFIG_NET_NS
 extern void __put_net(struct net *net);
 
 static inline struct net *get_net(struct net *net)
@@ -30,6 +60,18 @@ static inline struct net *get_net(struct net *net)
        return net;
 }
 
+static inline struct net *maybe_get_net(struct net *net)
+{
+       /* Used when we know struct net exists but we
+        * aren't guaranteed a previous reference count
+        * exists.  If the reference count is zero this
+        * function fails and returns NULL.
+        */
+       if (!atomic_inc_not_zero(&net->count))
+               net = NULL;
+       return net;
+}
+
 static inline void put_net(struct net *net)
 {
        if (atomic_dec_and_test(&net->count))
@@ -46,13 +88,41 @@ static inline void release_net(struct net *net)
 {
        atomic_dec(&net->use_count);
 }
+#else
+static inline struct net *get_net(struct net *net)
+{
+       return net;
+}
 
-extern void net_lock(void);
-extern void net_unlock(void);
+static inline void put_net(struct net *net)
+{
+}
+
+static inline struct net *hold_net(struct net *net)
+{
+       return net;
+}
+
+static inline void release_net(struct net *net)
+{
+}
+
+static inline struct net *maybe_get_net(struct net *net)
+{
+       return net;
+}
+#endif
 
 #define for_each_net(VAR)                              \
        list_for_each_entry(VAR, &net_namespace_list, list)
 
+#ifdef CONFIG_NET_NS
+#define __net_init
+#define __net_exit
+#else
+#define __net_init     __init
+#define __net_exit     __exit_refok
+#endif
 
 struct pernet_operations {
        struct list_head list;