1 files changed, 16 insertions, 17 deletions

diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index c4719ce604c2..cf68e6e4054a 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -165,10 +165,9 @@ static void rose_remove_socket(struct sock *sk)
 void rose_kill_by_neigh(struct rose_neigh *neigh)
 {
         struct sock *s;
-        struct hlist_node *node;
 
         spin_lock_bh(&rose_list_lock);
-        sk_for_each(s, node, &rose_list) {
+        sk_for_each(s, &rose_list) {
                 struct rose_sock *rose = rose_sk(s);
 
                 if (rose->neighbour == neigh) {
@@ -186,10 +185,9 @@ void rose_kill_by_neigh(struct rose_neigh *neigh)
 static void rose_kill_by_device(struct net_device *dev)
 {
         struct sock *s;
-        struct hlist_node *node;
 
         spin_lock_bh(&rose_list_lock);
-        sk_for_each(s, node, &rose_list) {
+        sk_for_each(s, &rose_list) {
                 struct rose_sock *rose = rose_sk(s);
 
                 if (rose->device == dev) {
@@ -246,10 +244,9 @@ static void rose_insert_socket(struct sock *sk)
 static struct sock *rose_find_listener(rose_address *addr, ax25_address *call)
 {
         struct sock *s;
-        struct hlist_node *node;
 
         spin_lock_bh(&rose_list_lock);
-        sk_for_each(s, node, &rose_list) {
+        sk_for_each(s, &rose_list) {
                 struct rose_sock *rose = rose_sk(s);
 
                 if (!rosecmp(&rose->source_addr, addr) &&
@@ -258,7 +255,7 @@ static struct sock *rose_find_listener(rose_address *addr, ax25_address *call)
                         goto found;
         }
 
-        sk_for_each(s, node, &rose_list) {
+        sk_for_each(s, &rose_list) {
                 struct rose_sock *rose = rose_sk(s);
 
                 if (!rosecmp(&rose->source_addr, addr) &&
@@ -278,10 +275,9 @@ found:
 struct sock *rose_find_socket(unsigned int lci, struct rose_neigh *neigh)
 {
         struct sock *s;
-        struct hlist_node *node;
 
         spin_lock_bh(&rose_list_lock);
-        sk_for_each(s, node, &rose_list) {
+        sk_for_each(s, &rose_list) {
                 struct rose_sock *rose = rose_sk(s);
 
                 if (rose->lci == lci && rose->neighbour == neigh)
@@ -1575,10 +1571,13 @@ static int __init rose_proto_init(void)
 
         rose_add_loopback_neigh();
 
-        proc_net_fops_create(&init_net, "rose", S_IRUGO, &rose_info_fops);
-        proc_net_fops_create(&init_net, "rose_neigh", S_IRUGO, &rose_neigh_fops);
-        proc_net_fops_create(&init_net, "rose_nodes", S_IRUGO, &rose_nodes_fops);
-        proc_net_fops_create(&init_net, "rose_routes", S_IRUGO, &rose_routes_fops);
+        proc_create("rose", S_IRUGO, init_net.proc_net, &rose_info_fops);
+        proc_create("rose_neigh", S_IRUGO, init_net.proc_net,
+                    &rose_neigh_fops);
+        proc_create("rose_nodes", S_IRUGO, init_net.proc_net,
+                    &rose_nodes_fops);
+        proc_create("rose_routes", S_IRUGO, init_net.proc_net,
+                    &rose_routes_fops);
 out:
         return rc;
 fail:
@@ -1605,10 +1604,10 @@ static void __exit rose_exit(void)
 {
         int i;
 
-        proc_net_remove(&init_net, "rose");
-        proc_net_remove(&init_net, "rose_neigh");
-        proc_net_remove(&init_net, "rose_nodes");
-        proc_net_remove(&init_net, "rose_routes");
+        remove_proc_entry("rose", init_net.proc_net);
+        remove_proc_entry("rose_neigh", init_net.proc_net);
+        remove_proc_entry("rose_nodes", init_net.proc_net);
+        remove_proc_entry("rose_routes", init_net.proc_net);
         rose_loopback_clear();
 
         rose_rt_free();