leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sched: rename tcf_destroy to tcf_destroy_proto

Browse Source 
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>
This commit is contained in:
Jiri Pirko 2017-02-09 14:38:55 +01:00 committed by David S. Miller
parent b4c4ebcf3c
commit 79112c26f1
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/sch_generic.h
View File

@ -405,7 +405,7 @@ struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue,
const struct Qdisc_ops *ops, u32 parentid); const struct Qdisc_ops *ops, u32 parentid);
void __qdisc_calculate_pkt_len(struct sk_buff *skb, void __qdisc_calculate_pkt_len(struct sk_buff *skb,
const struct qdisc_size_table *stab); 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); void tcf_destroy_chain(struct tcf_proto __rcu **fl);
int skb_do_redirect(struct sk_buff *); int skb_do_redirect(struct sk_buff *);

8
net/sched/cls_api.c
View File

@ -323,7 +323,7 @@ replay:
tfilter_notify(net, skb, n, tp, fh, tfilter_notify(net, skb, n, tp, fh,
RTM_DELTFILTER, false); RTM_DELTFILTER, false);
tcf_destroy(tp, true); tcf_proto_destroy(tp, true);
err = 0; err = 0;
goto errout; goto errout;
} }
@ -338,7 +338,7 @@ replay:
err = -EEXIST; err = -EEXIST;
if (n->nlmsg_flags & NLM_F_EXCL) { if (n->nlmsg_flags & NLM_F_EXCL) {
if (tp_created) if (tp_created)
tcf_destroy(tp, true); tcf_proto_destroy(tp, true);
goto errout; goto errout;
} }
break; break;
@ -350,7 +350,7 @@ replay:
tfilter_notify(net, skb, n, tp, tfilter_notify(net, skb, n, tp,
t->tcm_handle, t->tcm_handle,
RTM_DELTFILTER, false); RTM_DELTFILTER, false);
if (tcf_destroy(tp, false)) if (tcf_proto_destroy(tp, false))
RCU_INIT_POINTER(*back, next); RCU_INIT_POINTER(*back, next);
} }
goto errout; goto errout;
@ -374,7 +374,7 @@ replay:
tfilter_notify(net, skb, n, tp, fh, RTM_NEWTFILTER, false); tfilter_notify(net, skb, n, tp, fh, RTM_NEWTFILTER, false);
} else { } else {
if (tp_created) if (tp_created)
tcf_destroy(tp, true); tcf_proto_destroy(tp, true);
} }
errout: errout:

4
net/sched/sch_api.c
View File

@ -1900,7 +1900,7 @@ reset:
} }
EXPORT_SYMBOL(tc_classify); 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)) { if (tp->ops->destroy(tp, force)) {
module_put(tp->ops->owner); module_put(tp->ops->owner);
@ -1917,7 +1917,7 @@ void tcf_destroy_chain(struct tcf_proto __rcu **fl)
while ((tp = rtnl_dereference(*fl)) != NULL) { while ((tp = rtnl_dereference(*fl)) != NULL) {
RCU_INIT_POINTER(*fl, tp->next); RCU_INIT_POINTER(*fl, tp->next);
tcf_destroy(tp, true); tcf_proto_destroy(tp, true);
} }
} }
EXPORT_SYMBOL(tcf_destroy_chain); EXPORT_SYMBOL(tcf_destroy_chain);