1 files changed, 4 insertions, 35 deletions

diff --git a/net/core/sock.c b/net/core/sock.c
index c14ce0198d25..252d21a1bb04 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1851,46 +1851,15 @@ void proto_unregister(struct proto *prot)
 EXPORT_SYMBOL(proto_unregister);
 
 #ifdef CONFIG_PROC_FS
-static inline struct proto *__proto_head(void)
-{
-        return list_entry(proto_list.next, struct proto, node);
-}
-
-static inline struct proto *proto_head(void)
-{
-        return list_empty(&proto_list) ? NULL : __proto_head();
-}
-
-static inline struct proto *proto_next(struct proto *proto)
-{
-        return proto->node.next == &proto_list ? NULL :
-                list_entry(proto->node.next, struct proto, node);
-}
-
-static inline struct proto *proto_get_idx(loff_t pos)
-{
-        struct proto *proto;
-        loff_t i = 0;
-
-        list_for_each_entry(proto, &proto_list, node)
-                if (i++ == pos)
-                        goto out;
-
-        proto = NULL;
-out:
-        return proto;
-}
-
 static void *proto_seq_start(struct seq_file *seq, loff_t *pos)
 {
         read_lock(&proto_list_lock);
-        return *pos ? proto_get_idx(*pos - 1) : SEQ_START_TOKEN;
+        return seq_list_start_head(&proto_list, *pos);
 }
 
 static void *proto_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-        ++*pos;
-        return v == SEQ_START_TOKEN ? proto_head() : proto_next(v);
+        return seq_list_next(v, &proto_list, pos);
 }
 
 static void proto_seq_stop(struct seq_file *seq, void *v)
@@ -1938,7 +1907,7 @@ static void proto_seq_printf(struct seq_file *seq, struct proto *proto)
 
 static int proto_seq_show(struct seq_file *seq, void *v)
 {
-        if (v == SEQ_START_TOKEN)
+        if (v == &proto_list)
                 seq_printf(seq, "%-9s %-4s %-8s %-6s %-5s %-7s %-4s %-10s %s",
                            "protocol",
                            "size",
@@ -1950,7 +1919,7 @@ static int proto_seq_show(struct seq_file *seq, void *v)
                            "module",
                            "cl co di ac io in de sh ss gs se re sp bi br ha uh gp em\n");
         else
-                proto_seq_printf(seq, v);
+                proto_seq_printf(seq, list_entry(v, struct proto, node));
         return 0;
 }