Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
---

 lxc-dave/net/net_ns.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff -puN net/net_ns.c~A1.2-netns-cleanups-3 net/net_ns.c
--- lxc/net/net_ns.c~A1.2-netns-cleanups-3	2006-05-31 12:48:43.000000000 -0700
+++ lxc-dave/net/net_ns.c	2006-05-31 12:48:43.000000000 -0700
@@ -55,7 +55,7 @@ int net_ns_unregister_dev(struct net_dev
 	return ret;
 }
 
-EXPORT_SYMBOL(net_ns_unregister_dev);
+EXPORT_SYMBOL_GPL(net_ns_unregister_dev);
 
 /*
  * Add a device to the namespace network devices list
@@ -64,7 +64,7 @@ EXPORT_SYMBOL(net_ns_unregister_dev);
  * @dev_list: network namespace devices
  * Return ENOMEM if allocation fails, 0 on success
  */
-extern int net_ns_register_dev(struct net_device* dev,
+int net_ns_register_dev(struct net_device* dev,
 			       struct net_ns_dev_list *devlist)
 {
 	struct net_ns_dev *db;
@@ -82,7 +82,7 @@ extern int net_ns_register_dev(struct ne
 	return 0;
 }
 
-EXPORT_SYMBOL(net_ns_register_dev);
+EXPORT_SYMBOL_GPL(net_ns_register_dev);
 
 /*
  * Add a device to the namespace network devices list
@@ -91,7 +91,7 @@ EXPORT_SYMBOL(net_ns_register_dev);
  * Return ENODEV if the device does not exist,
  * ENOMEM if allocation fails, 0 on success
  */
-extern int net_ns_add_dev(const char* devname,
+int net_ns_add_dev(const char* devname,
 			  struct net_ns_dev_list *devlist)
 {
 	struct net_ns_dev *db;
@@ -127,7 +127,7 @@ out:
 	return ret;
 }
 
-EXPORT_SYMBOL(net_ns_add_dev);
+EXPORT_SYMBOL_GPL(net_ns_add_dev);
 
 /*
  * Remove a device from the namespace network devices list
@@ -135,7 +135,7 @@ EXPORT_SYMBOL(net_ns_add_dev);
  * @dev_list: network namespace devices
  * Return ENODEV if the device does not exist, 0 on success
  */
-extern int net_ns_remove_dev(const char* devname,
+int net_ns_remove_dev(const char* devname,
 			     struct net_ns_dev_list *devlist)
 {
 	struct net_ns_dev *db;
@@ -162,7 +162,7 @@ out:
 	return ret;
 }
 
-EXPORT_SYMBOL(net_ns_remove_dev);
+EXPORT_SYMBOL_GPL(net_ns_remove_dev);
 
 /*
  * Find a namespace network device
@@ -170,7 +170,7 @@ EXPORT_SYMBOL(net_ns_remove_dev);
  * @dev_list: network namespace devices
  * Return ENODEV if the device does not exist, 0 on success
  */
-extern  struct net_device *net_ns_find_dev_by_name(const char* devname,
+struct net_device *net_ns_find_dev_by_name(const char* devname,
 						   struct net_ns_dev_list *devlist)
 {
 	struct net_ns_dev *db;
@@ -194,7 +194,7 @@ out:
 	return dev;
 }
 
-EXPORT_SYMBOL(net_ns_find_dev_by_name);
+EXPORT_SYMBOL_GPL(net_ns_find_dev_by_name);
 
 /*
  * Clone a new ns copying an original, setting refcount to 1
@@ -202,7 +202,7 @@ EXPORT_SYMBOL(net_ns_find_dev_by_name);
  * @old_ns: namespace to clone
  * Return NULL on error (failure to kmalloc), new ns otherwise
  */
-extern struct net_namespace *clone_net_ns(struct net_namespace *old_ns)
+struct net_namespace *clone_net_ns(struct net_namespace *old_ns)
 {
 	struct net_namespace *new_ns;
 	struct net_ns_dev_list* new_dev_list;
@@ -297,7 +297,7 @@ static int free_net_ns_dev(struct net_ns
 	return 0;
 }
 
-extern void free_net_ns(struct kref *kref)
+void free_net_ns(struct kref *kref)
 {
 	struct net_namespace *ns;
 
_