net_sched: convert tcf_proto_ops to use struct list_head

We don't need to maintain our own singly linked list code.

Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index d0a6321c302ef2316628b747da27f37cada0b920..013d96dc69183c906adeeca604ecf8a7cea80082 100644 (file)
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -185,7 +185,7 @@ struct tcf_result {
 };
 
 struct tcf_proto_ops {
-       struct tcf_proto_ops    *next;
+       struct list_head        head;
        char                    kind[IFNAMSIZ];
 
        int                     (*classify)(struct sk_buff *,

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 028c980ef87dbb7b63cc6277a87a25273434dffd..6b085cf27a65cfbbdcf319c061ce23c174ac4fbe 100644 (file)
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -31,8 +31,7 @@
 #include <net/pkt_cls.h>
 
 /* The list of all installed classifier types */
-
-static struct tcf_proto_ops *tcf_proto_base __read_mostly;
+static LIST_HEAD(tcf_proto_base);
 
 /* Protects list of registered TC modules. It is pure SMP lock. */
 static DEFINE_RWLOCK(cls_mod_lock);
@@ -45,7 +44,7 @@ static const struct tcf_proto_ops *tcf_proto_lookup_ops(struct nlattr *kind)
 
        if (kind) {
                read_lock(&cls_mod_lock);
-               for (t = tcf_proto_base; t; t = t->next) {
+               list_for_each_entry(t, &tcf_proto_base, head) {
                        if (nla_strcmp(kind, t->kind) == 0) {
                                if (!try_module_get(t->owner))
                                        t = NULL;
@@ -61,16 +60,15 @@ static const struct tcf_proto_ops *tcf_proto_lookup_ops(struct nlattr *kind)
 
 int register_tcf_proto_ops(struct tcf_proto_ops *ops)
 {
-       struct tcf_proto_ops *t, **tp;
+       struct tcf_proto_ops *t;
        int rc = -EEXIST;
 
        write_lock(&cls_mod_lock);
-       for (tp = &tcf_proto_base; (t = *tp) != NULL; tp = &t->next)
+       list_for_each_entry(t, &tcf_proto_base, head)
                if (!strcmp(ops->kind, t->kind))
                        goto out;
 
-       ops->next = NULL;
-       *tp = ops;
+       list_add_tail(&ops->head, &tcf_proto_base);
        rc = 0;
 out:
        write_unlock(&cls_mod_lock);
@@ -80,17 +78,17 @@ EXPORT_SYMBOL(register_tcf_proto_ops);
 
 int unregister_tcf_proto_ops(struct tcf_proto_ops *ops)
 {
-       struct tcf_proto_ops *t, **tp;
+       struct tcf_proto_ops *t;
        int rc = -ENOENT;
 
        write_lock(&cls_mod_lock);
-       for (tp = &tcf_proto_base; (t = *tp) != NULL; tp = &t->next)
+       list_for_each_entry(t, &tcf_proto_base, head)
                if (t == ops)
                        break;
 
        if (!t)
                goto out;
-       *tp = t->next;
+       list_del(&t->head);
        rc = 0;
 out:
        write_unlock(&cls_mod_lock);