1 files changed, 8 insertions, 21 deletions

diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 7a834952f67f..fa07f044b599 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -15,6 +15,7 @@
 #include <linux/types.h>
 #include <linux/socket.h>
 #include <linux/in.h>
+#include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/timer.h>
@@ -425,12 +426,13 @@ static struct proto nr_proto = {
         .obj_size = sizeof(struct nr_sock),
 };
 
-static int nr_create(struct net *net, struct socket *sock, int protocol)
+static int nr_create(struct net *net, struct socket *sock, int protocol,
+                     int kern)
 {
         struct sock *sk;
         struct nr_sock *nr;
 
-        if (net != &init_net)
+        if (!net_eq(net, &init_net))
                 return -EAFNOSUPPORT;
 
         if (sock->type != SOCK_SEQPACKET || protocol != 0)
@@ -1266,28 +1268,13 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 
 static void *nr_info_start(struct seq_file *seq, loff_t *pos)
 {
-        struct sock *s;
-        struct hlist_node *node;
-        int i = 1;
-
         spin_lock_bh(&nr_list_lock);
-        if (*pos == 0)
-                return SEQ_START_TOKEN;
-
-        sk_for_each(s, node, &nr_list) {
-                if (i == *pos)
-                        return s;
-                ++i;
-        }
-        return NULL;
+        return seq_hlist_start_head(&nr_list, *pos);
 }
 
 static void *nr_info_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-        ++*pos;
-
-        return (v == SEQ_START_TOKEN) ? sk_head(&nr_list)
-                : sk_next((struct sock *)v);
+        return seq_hlist_next(v, &nr_list, pos);
 }
 
 static void nr_info_stop(struct seq_file *seq, void *v)
@@ -1297,7 +1284,7 @@ static void nr_info_stop(struct seq_file *seq, void *v)
 
 static int nr_info_show(struct seq_file *seq, void *v)
 {
-        struct sock *s = v;
+        struct sock *s = sk_entry(v);
         struct net_device *dev;
         struct nr_sock *nr;
         const char *devname;
@@ -1372,7 +1359,7 @@ static const struct file_operations nr_info_fops = {
 };
 #endif  /* CONFIG_PROC_FS */
 
-static struct net_proto_family nr_family_ops = {
+static const struct net_proto_family nr_family_ops = {
         .family         =       PF_NETROM,
         .create         =       nr_create,
         .owner          =       THIS_MODULE,