sched: rename tcf_destroy to tcf_destroy_proto

This function destroys TC filter protocol, not TC filter. So name it
accordingly.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-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 e2f426f6d62f760ff7c4f6deb69947daa39cbe14..453350650b9af28120d254c4260e4350e73b6de5 100644 (file)
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -405,7 +405,7 @@ struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue,
                                const struct Qdisc_ops *ops, u32 parentid);
 void __qdisc_calculate_pkt_len(struct sk_buff *skb,
                               const struct qdisc_size_table *stab);
-bool tcf_destroy(struct tcf_proto *tp, bool force);
+bool tcf_proto_destroy(struct tcf_proto *tp, bool force);
 void tcf_destroy_chain(struct tcf_proto __rcu **fl);
 int skb_do_redirect(struct sk_buff *);
 

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 1ecdf809b5fa8913d56bb4194ac193274d4d625a..90536ebae02a62ba7d2ba38a899ad115cc4e11ac 100644 (file)
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -323,7 +323,7 @@ replay:
 
                        tfilter_notify(net, skb, n, tp, fh,
                                       RTM_DELTFILTER, false);
-                       tcf_destroy(tp, true);
+                       tcf_proto_destroy(tp, true);
                        err = 0;
                        goto errout;
                }
@@ -338,7 +338,7 @@ replay:
                        err = -EEXIST;
                        if (n->nlmsg_flags & NLM_F_EXCL) {
                                if (tp_created)
-                                       tcf_destroy(tp, true);
+                                       tcf_proto_destroy(tp, true);
                                goto errout;
                        }
                        break;
@@ -350,7 +350,7 @@ replay:
                                tfilter_notify(net, skb, n, tp,
                                               t->tcm_handle,
                                               RTM_DELTFILTER, false);
-                               if (tcf_destroy(tp, false))
+                               if (tcf_proto_destroy(tp, false))
                                        RCU_INIT_POINTER(*back, next);
                        }
                        goto errout;
@@ -374,7 +374,7 @@ replay:
                tfilter_notify(net, skb, n, tp, fh, RTM_NEWTFILTER, false);
        } else {
                if (tp_created)
-                       tcf_destroy(tp, true);
+                       tcf_proto_destroy(tp, true);
        }
 
 errout:

diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index ef53ede11590924f51bca17f79fb8ad9697366be..f30b517f22820be046760d7f009a7cadc8a41c8e 100644 (file)
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -1900,7 +1900,7 @@ reset:
 }
 EXPORT_SYMBOL(tc_classify);
 
-bool tcf_destroy(struct tcf_proto *tp, bool force)
+bool tcf_proto_destroy(struct tcf_proto *tp, bool force)
 {
        if (tp->ops->destroy(tp, force)) {
                module_put(tp->ops->owner);
@@ -1917,7 +1917,7 @@ void tcf_destroy_chain(struct tcf_proto __rcu **fl)
 
        while ((tp = rtnl_dereference(*fl)) != NULL) {
                RCU_INIT_POINTER(*fl, tp->next);
-               tcf_destroy(tp, true);
+               tcf_proto_destroy(tp, true);
        }
 }
 EXPORT_SYMBOL(tcf_destroy_chain);