11 files changed, 38 insertions, 27 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 1afda3230def..5de648f90a45 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -75,6 +75,7 @@
 #include <linux/if_vlan.h>
 #include <linux/if_bonding.h>
 #include <net/route.h>
+#include <net/net_namespace.h>
 #include "bonding.h"
 #include "bond_3ad.h"
 #include "bond_alb.h"
@@ -3144,7 +3145,7 @@ static void bond_create_proc_dir(void)
 {
         int len = strlen(DRV_NAME);
 
-        for (bond_proc_dir = proc_net->subdir; bond_proc_dir;
+        for (bond_proc_dir = init_net.proc_net->subdir; bond_proc_dir;
              bond_proc_dir = bond_proc_dir->next) {
                 if ((bond_proc_dir->namelen == len) &&
                     !memcmp(bond_proc_dir->name, DRV_NAME, len)) {
@@ -3153,7 +3154,7 @@ static void bond_create_proc_dir(void)
         }
 
         if (!bond_proc_dir) {
-                bond_proc_dir = proc_mkdir(DRV_NAME, proc_net);
+                bond_proc_dir = proc_mkdir(DRV_NAME, init_net.proc_net);
                 if (bond_proc_dir) {
                         bond_proc_dir->owner = THIS_MODULE;
                 } else {
@@ -3188,7 +3189,7 @@ static void bond_destroy_proc_dir(void)
                         bond_proc_dir->owner = NULL;
                 }
         } else {
-                remove_proc_entry(DRV_NAME, proc_net);
+                remove_proc_entry(DRV_NAME, init_net.proc_net);
                 bond_proc_dir = NULL;
         }
 }
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index cc0ee93669ea..1699d42d13ca 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -83,6 +83,7 @@
 
 #include <net/ip.h>
 #include <net/arp.h>
+#include <net/net_namespace.h>
 
 #include <linux/bpqether.h>
 
@@ -594,7 +595,7 @@ static int bpq_device_event(struct notifier_block *this,unsigned long event, voi
 static int __init bpq_init_driver(void)
 {
 #ifdef CONFIG_PROC_FS
-        if (!proc_net_fops_create("bpqether", S_IRUGO, &bpq_info_fops)) {
+        if (!proc_net_fops_create(&init_net, "bpqether", S_IRUGO, &bpq_info_fops)) {
                 printk(KERN_ERR
                         "bpq: cannot create /proc/net/bpqether entry.\n");
                 return -ENOENT;
@@ -618,7 +619,7 @@ static void __exit bpq_cleanup_driver(void)
 
         unregister_netdevice_notifier(&bpq_dev_notifier);
 
-        proc_net_remove("bpqether");
+        proc_net_remove(&init_net, "bpqether");
 
         rtnl_lock();
         while (!list_empty(&bpq_devices)) {
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index 6fdaad5a4577..39b3b82aa4a4 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -174,6 +174,7 @@
 #include <linux/seq_file.h>
 #include <linux/bitops.h>
 
+#include <net/net_namespace.h>
 #include <net/ax25.h>
 
 #include <asm/irq.h>
@@ -2114,7 +2115,7 @@ static int __init scc_init_driver (void)
         }
         rtnl_unlock();
 
-        proc_net_fops_create("z8530drv", 0, &scc_net_seq_fops);
+        proc_net_fops_create(&init_net, "z8530drv", 0, &scc_net_seq_fops);
 
         return 0;
 }
@@ -2169,7 +2170,7 @@ static void __exit scc_cleanup_driver(void)
         if (Vector_Latch)
                 release_region(Vector_Latch, 1);
 
-        proc_net_remove("z8530drv");
+        proc_net_remove(&init_net, "z8530drv");
 }
 
 MODULE_AUTHOR("Joerg Reuter <jreuter@yaina.de>");
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 467559debfd6..401724ddafcd 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -65,6 +65,7 @@
 #include <linux/kernel.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <net/net_namespace.h>
 
 #include <asm/uaccess.h>
 #include <linux/init.h>
@@ -1142,7 +1143,7 @@ static int __init yam_init_driver(void)
         yam_timer.expires = jiffies + HZ / 100;
         add_timer(&yam_timer);
 
-        proc_net_fops_create("yam", S_IRUGO, &yam_info_fops);
+        proc_net_fops_create(&init_net, "yam", S_IRUGO, &yam_info_fops);
         return 0;
  error:
         while (--i >= 0) {
@@ -1174,7 +1175,7 @@ static void __exit yam_cleanup_driver(void)
                 kfree(p);
         }
 
-        proc_net_remove("yam");
+        proc_net_remove(&init_net, "yam");
 }
 
 /* --------------------------------------------------------------------- */
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 78e28ada1e21..0c35d72f5f8d 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -47,6 +47,7 @@
 #include <linux/mm.h>
 #include <linux/ethtool.h>
 #include <linux/proc_fs.h>
+#include <net/net_namespace.h>
 #include <asm/semaphore.h>
 #include <asm/hvcall.h>
 #include <asm/atomic.h>
@@ -97,7 +98,7 @@ static void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter);
 static struct kobj_type ktype_veth_pool;
 
 #ifdef CONFIG_PROC_FS
-#define IBMVETH_PROC_DIR "net/ibmveth"
+#define IBMVETH_PROC_DIR "ibmveth"
 static struct proc_dir_entry *ibmveth_proc_dir;
 #endif
 
@@ -1091,7 +1092,7 @@ static int __devexit ibmveth_remove(struct vio_dev *dev)
 #ifdef CONFIG_PROC_FS
 static void ibmveth_proc_register_driver(void)
 {
-        ibmveth_proc_dir = proc_mkdir(IBMVETH_PROC_DIR, NULL);
+        ibmveth_proc_dir = proc_mkdir(IBMVETH_PROC_DIR, init_net.proc_net);
         if (ibmveth_proc_dir) {
                 SET_MODULE_OWNER(ibmveth_proc_dir);
         }
@@ -1099,7 +1100,7 @@ static void ibmveth_proc_register_driver(void)
 
 static void ibmveth_proc_unregister_driver(void)
 {
-        remove_proc_entry(IBMVETH_PROC_DIR, NULL);
+        remove_proc_entry(IBMVETH_PROC_DIR, init_net.proc_net);
 }
 
 static void *ibmveth_seq_start(struct seq_file *seq, loff_t *pos)
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 9b30cd600a64..ee8ce195c538 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -78,6 +78,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
+#include <net/net_namespace.h>
 #include <net/sock.h>
 
 #include <asm/uaccess.h>
@@ -1042,7 +1043,7 @@ static int __init pppoe_proc_init(void)
 {
         struct proc_dir_entry *p;
 
-        p = create_proc_entry("net/pppoe", S_IRUGO, NULL);
+        p = create_proc_entry("pppoe", S_IRUGO, init_net.proc_net);
         if (!p)
                 return -ENOMEM;
 
@@ -1113,7 +1114,7 @@ static void __exit pppoe_exit(void)
         dev_remove_pack(&pppoes_ptype);
         dev_remove_pack(&pppoed_ptype);
         unregister_netdevice_notifier(&pppoe_notifier);
-        remove_proc_entry("net/pppoe", NULL);
+        remove_proc_entry("pppoe", init_net.proc_net);
         proto_unregister(&pppoe_sk_proto);
 }
 
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index abe91cb595f4..2eb424ba58e5 100644
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -91,6 +91,7 @@
 #include <linux/hash.h>
 #include <linux/sort.h>
 #include <linux/proc_fs.h>
+#include <net/net_namespace.h>
 #include <net/dst.h>
 #include <net/ip.h>
 #include <net/udp.h>
@@ -2444,7 +2445,7 @@ static int __init pppol2tp_init(void)
                 goto out_unregister_pppol2tp_proto;
 
 #ifdef CONFIG_PROC_FS
-        pppol2tp_proc = create_proc_entry("pppol2tp", 0, proc_net);
+        pppol2tp_proc = create_proc_entry("pppol2tp", 0, init_net.proc_net);
         if (!pppol2tp_proc) {
                 err = -ENOMEM;
                 goto out_unregister_pppox_proto;
@@ -2469,7 +2470,7 @@ static void __exit pppol2tp_exit(void)
         unregister_pppox_proto(PX_PROTO_OL2TP);
 
 #ifdef CONFIG_PROC_FS
-        remove_proc_entry("pppol2tp", proc_net);
+        remove_proc_entry("pppol2tp", init_net.proc_net);
 #endif
         proto_unregister(&pppol2tp_sk_proto);
 }
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index 5d849c089a3b..fc4495581f96 100644
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -123,6 +123,7 @@
 #include <linux/bitops.h>
 #include <linux/jiffies.h>
 
+#include <net/net_namespace.h>
 #include <net/checksum.h>
 
 #include <asm/io.h>
@@ -250,7 +251,7 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
 #if STREAMER_NETWORK_MONITOR
 #ifdef CONFIG_PROC_FS
         if (!dev_streamer)
-                create_proc_read_entry("net/streamer_tr", 0, 0,
+                create_proc_read_entry("streamer_tr", 0, init_net.proc_net,
                                         streamer_proc_info, NULL); 
         streamer_priv->next = dev_streamer;
         dev_streamer = streamer_priv;
@@ -423,7 +424,7 @@ static void __devexit streamer_remove_one(struct pci_dev *pdev)
                         }
                 }
                 if (!dev_streamer)
-                        remove_proc_entry("net/streamer_tr", NULL);
+                        remove_proc_entry("streamer_tr", init_net.proc_net);
         }
 #endif
 #endif
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
index 09b3cfb8e809..c323101a895b 100644
--- a/drivers/net/tokenring/olympic.c
+++ b/drivers/net/tokenring/olympic.c
@@ -102,6 +102,7 @@
 #include <linux/jiffies.h>
 
 #include <net/checksum.h>
+#include <net/net_namespace.h>
 
 #include <asm/io.h>
 #include <asm/system.h>
@@ -268,9 +269,9 @@ static int __devinit olympic_probe(struct pci_dev *pdev, const struct pci_device
         printk("Olympic: %s registered as: %s\n",olympic_priv->olympic_card_name,dev->name);
         if (olympic_priv->olympic_network_monitor) { /* Must go after register_netdev as we need the device name */ 
                 char proc_name[20] ; 
-                strcpy(proc_name,"net/olympic_") ; 
+                strcpy(proc_name,"olympic_") ;
                 strcat(proc_name,dev->name) ; 
-                create_proc_read_entry(proc_name,0,NULL,olympic_proc_info,(void *)dev) ; 
+                create_proc_read_entry(proc_name,0,init_net.proc_net,olympic_proc_info,(void *)dev) ;
                 printk("Olympic: Network Monitor information: /proc/%s\n",proc_name); 
         }
         return  0 ;
@@ -1752,9 +1753,9 @@ static void __devexit olympic_remove_one(struct pci_dev *pdev)
 
         if (olympic_priv->olympic_network_monitor) { 
                 char proc_name[20] ; 
-                strcpy(proc_name,"net/olympic_") ; 
+                strcpy(proc_name,"olympic_") ;
                 strcat(proc_name,dev->name) ;
-                remove_proc_entry(proc_name,NULL); 
+                remove_proc_entry(proc_name,init_net.proc_net);
         }
         unregister_netdev(dev) ; 
         iounmap(olympic_priv->olympic_mmio) ; 
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index 446de51bab74..9a470e80ca24 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -24,6 +24,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/wireless.h>
 #include <linux/etherdevice.h>
+#include <net/net_namespace.h>
 #include <net/iw_handler.h>
 #include <net/ieee80211.h>
 #include <net/ieee80211_crypt.h>
@@ -1093,8 +1094,8 @@ struct proc_dir_entry *hostap_proc;
 
 static int __init hostap_init(void)
 {
-        if (proc_net != NULL) {
-                hostap_proc = proc_mkdir("hostap", proc_net);
+        if (init_net.proc_net != NULL) {
+                hostap_proc = proc_mkdir("hostap", init_net.proc_net);
                 if (!hostap_proc)
                         printk(KERN_WARNING "Failed to mkdir "
                                "/proc/net/hostap\n");
@@ -1109,7 +1110,7 @@ static void __exit hostap_exit(void)
 {
         if (hostap_proc != NULL) {
                 hostap_proc = NULL;
-                remove_proc_entry("hostap", proc_net);
+                remove_proc_entry("hostap", init_net.proc_net);
         }
 }
 
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index ef32a5c1e818..edb214e8c744 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -107,6 +107,7 @@ static const char StripVersion[] = "1.3A-STUART.CHESHIRE";
 #include <linux/serialP.h>
 #include <linux/rcupdate.h>
 #include <net/arp.h>
+#include <net/net_namespace.h>
 
 #include <linux/ip.h>
 #include <linux/tcp.h>
@@ -2787,7 +2788,7 @@ static int __init strip_init_driver(void)
         /*
          * Register the status file with /proc
          */
-        proc_net_fops_create("strip", S_IFREG | S_IRUGO, &strip_seq_fops);
+        proc_net_fops_create(&init_net, "strip", S_IFREG | S_IRUGO, &strip_seq_fops);
 
         return status;
 }
@@ -2809,7 +2810,7 @@ static void __exit strip_exit_driver(void)
         }
 
         /* Unregister with the /proc/net file here. */
-        proc_net_remove("strip");
+        proc_net_remove(&init_net, "strip");
 
         if ((i = tty_unregister_ldisc(N_STRIP)))
                 printk(KERN_ERR "STRIP: can't unregister line discipline (err = %d)\n", i);