diff options
Diffstat (limited to 'drivers/net/hamradio')
-rw-r--r-- | drivers/net/hamradio/bpqether.c | 5 | ||||
-rw-r--r-- | drivers/net/hamradio/scc.c | 5 | ||||
-rw-r--r-- | drivers/net/hamradio/yam.c | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c index cc0ee93669e..1699d42d13c 100644 --- a/drivers/net/hamradio/bpqether.c +++ b/drivers/net/hamradio/bpqether.c | |||
@@ -83,6 +83,7 @@ | |||
83 | 83 | ||
84 | #include <net/ip.h> | 84 | #include <net/ip.h> |
85 | #include <net/arp.h> | 85 | #include <net/arp.h> |
86 | #include <net/net_namespace.h> | ||
86 | 87 | ||
87 | #include <linux/bpqether.h> | 88 | #include <linux/bpqether.h> |
88 | 89 | ||
@@ -594,7 +595,7 @@ static int bpq_device_event(struct notifier_block *this,unsigned long event, voi | |||
594 | static int __init bpq_init_driver(void) | 595 | static int __init bpq_init_driver(void) |
595 | { | 596 | { |
596 | #ifdef CONFIG_PROC_FS | 597 | #ifdef CONFIG_PROC_FS |
597 | if (!proc_net_fops_create("bpqether", S_IRUGO, &bpq_info_fops)) { | 598 | if (!proc_net_fops_create(&init_net, "bpqether", S_IRUGO, &bpq_info_fops)) { |
598 | printk(KERN_ERR | 599 | printk(KERN_ERR |
599 | "bpq: cannot create /proc/net/bpqether entry.\n"); | 600 | "bpq: cannot create /proc/net/bpqether entry.\n"); |
600 | return -ENOENT; | 601 | return -ENOENT; |
@@ -618,7 +619,7 @@ static void __exit bpq_cleanup_driver(void) | |||
618 | 619 | ||
619 | unregister_netdevice_notifier(&bpq_dev_notifier); | 620 | unregister_netdevice_notifier(&bpq_dev_notifier); |
620 | 621 | ||
621 | proc_net_remove("bpqether"); | 622 | proc_net_remove(&init_net, "bpqether"); |
622 | 623 | ||
623 | rtnl_lock(); | 624 | rtnl_lock(); |
624 | while (!list_empty(&bpq_devices)) { | 625 | while (!list_empty(&bpq_devices)) { |
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index 6fdaad5a457..39b3b82aa4a 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c | |||
@@ -174,6 +174,7 @@ | |||
174 | #include <linux/seq_file.h> | 174 | #include <linux/seq_file.h> |
175 | #include <linux/bitops.h> | 175 | #include <linux/bitops.h> |
176 | 176 | ||
177 | #include <net/net_namespace.h> | ||
177 | #include <net/ax25.h> | 178 | #include <net/ax25.h> |
178 | 179 | ||
179 | #include <asm/irq.h> | 180 | #include <asm/irq.h> |
@@ -2114,7 +2115,7 @@ static int __init scc_init_driver (void) | |||
2114 | } | 2115 | } |
2115 | rtnl_unlock(); | 2116 | rtnl_unlock(); |
2116 | 2117 | ||
2117 | proc_net_fops_create("z8530drv", 0, &scc_net_seq_fops); | 2118 | proc_net_fops_create(&init_net, "z8530drv", 0, &scc_net_seq_fops); |
2118 | 2119 | ||
2119 | return 0; | 2120 | return 0; |
2120 | } | 2121 | } |
@@ -2169,7 +2170,7 @@ static void __exit scc_cleanup_driver(void) | |||
2169 | if (Vector_Latch) | 2170 | if (Vector_Latch) |
2170 | release_region(Vector_Latch, 1); | 2171 | release_region(Vector_Latch, 1); |
2171 | 2172 | ||
2172 | proc_net_remove("z8530drv"); | 2173 | proc_net_remove(&init_net, "z8530drv"); |
2173 | } | 2174 | } |
2174 | 2175 | ||
2175 | MODULE_AUTHOR("Joerg Reuter <jreuter@yaina.de>"); | 2176 | MODULE_AUTHOR("Joerg Reuter <jreuter@yaina.de>"); |
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index 467559debfd..401724ddafc 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c | |||
@@ -65,6 +65,7 @@ | |||
65 | #include <linux/kernel.h> | 65 | #include <linux/kernel.h> |
66 | #include <linux/proc_fs.h> | 66 | #include <linux/proc_fs.h> |
67 | #include <linux/seq_file.h> | 67 | #include <linux/seq_file.h> |
68 | #include <net/net_namespace.h> | ||
68 | 69 | ||
69 | #include <asm/uaccess.h> | 70 | #include <asm/uaccess.h> |
70 | #include <linux/init.h> | 71 | #include <linux/init.h> |
@@ -1142,7 +1143,7 @@ static int __init yam_init_driver(void) | |||
1142 | yam_timer.expires = jiffies + HZ / 100; | 1143 | yam_timer.expires = jiffies + HZ / 100; |
1143 | add_timer(&yam_timer); | 1144 | add_timer(&yam_timer); |
1144 | 1145 | ||
1145 | proc_net_fops_create("yam", S_IRUGO, &yam_info_fops); | 1146 | proc_net_fops_create(&init_net, "yam", S_IRUGO, &yam_info_fops); |
1146 | return 0; | 1147 | return 0; |
1147 | error: | 1148 | error: |
1148 | while (--i >= 0) { | 1149 | while (--i >= 0) { |
@@ -1174,7 +1175,7 @@ static void __exit yam_cleanup_driver(void) | |||
1174 | kfree(p); | 1175 | kfree(p); |
1175 | } | 1176 | } |
1176 | 1177 | ||
1177 | proc_net_remove("yam"); | 1178 | proc_net_remove(&init_net, "yam"); |
1178 | } | 1179 | } |
1179 | 1180 | ||
1180 | /* --------------------------------------------------------------------- */ | 1181 | /* --------------------------------------------------------------------- */ |