Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79112c26 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

sched: rename tcf_destroy to tcf_destroy_proto 



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

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b4c4ebcf

include/net/sch_generic.h

+1 −1
Original line number Diff line number Diff line
@@ -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 *);

net/sched/cls_api.c

+4 −4
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n) 


			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 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n) 
			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 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n) 
				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 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n) 
		tfilter_notify(net, skb, n, tp, fh, RTM_NEWTFILTER, false);

	} else {

		if (tp_created)

			tcf_destroy(tp, true);

			tcf_proto_destroy(tp, true);

	}



errout:

net/sched/sch_api.c

+2 −2
Original line number Diff line number Diff line
@@ -1900,7 +1900,7 @@ int tc_classify(struct sk_buff *skb, const struct tcf_proto *tp, 
}

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);