Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-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 13b0e3b547f09fec9dcbec224ba3ccd5e08906b6..93aa87d328040b71877a31ee400e7adebd3e2073 100644 (file)
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -96,12 +96,18 @@ static inline void release_net(struct net *net)
 #endif
 }
 
-extern void net_lock(void);
-extern void net_unlock(void);
-
 #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;