Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

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

diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 3ea4194613edfa434f18c903510733b4ba4cc329..5dd6d90b37eb778dfffde65e4998b0bdb8c8d13b 100644 (file)
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -9,6 +9,7 @@
 #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.
@@ -23,6 +24,8 @@ struct 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;
@@ -48,13 +51,12 @@ static inline struct net *copy_net_ns(unsigned long flags, struct net *net_ns)
 }
 #endif
 
+#ifdef CONFIG_NET_NS
 extern void __put_net(struct net *net);
 
 static inline struct net *get_net(struct net *net)
 {
-#ifdef CONFIG_NET
        atomic_inc(&net->count);
-#endif
        return net;
 }
 
@@ -72,33 +74,57 @@ static inline struct net *maybe_get_net(struct net *net)
 
 static inline void put_net(struct net *net)
 {
-#ifdef CONFIG_NET
        if (atomic_dec_and_test(&net->count))
                __put_net(net);
-#endif
 }
 
 static inline struct net *hold_net(struct net *net)
 {
-#ifdef CONFIG_NET
        atomic_inc(&net->use_count);
-#endif
        return net;
 }
 
 static inline void release_net(struct net *net)
 {
-#ifdef CONFIG_NET
        atomic_dec(&net->use_count);
-#endif
+}
+#else
+static inline struct net *get_net(struct net *net)
+{
+       return net;
+}
+
+static inline void put_net(struct net *net)
+{
 }
 
-extern void net_lock(void);
-extern void net_unlock(void);
+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
+#define __net_initdata
+#else
+#define __net_init     __init
+#define __net_exit     __exit_refok
+#define __net_initdata __initdata
+#endif
 
 struct pernet_operations {
        struct list_head list;