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

Commit 9d36d9e5 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: sched: replace nprio by a bool to make the function more readable 



The use of "nprio" variable in tc_ctl_tfilter is a bit cryptic and makes
a reader wonder what is going on for a while. So help him to understand
this priority allocation dance a litte bit better.

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 fbe9c5b0

net/sched/cls_api.c

+7 −6
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, 
	struct tcmsg *t;

	u32 protocol;

	u32 prio;

	u32 nprio;

	bool prio_allocate;

	u32 parent;

	struct net_device *dev;

	struct Qdisc  *q;
@@ -306,7 +306,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, 
	t = nlmsg_data(n);

	protocol = TC_H_MIN(t->tcm_info);

	prio = TC_H_MAJ(t->tcm_info);

	nprio = prio;

	prio_allocate = false;

	parent = t->tcm_parent;

	cl = 0;
@@ -322,6 +322,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, 
			 */

			if (n->nlmsg_flags & NLM_F_CREATE) {

				prio = TC_H_MAKE(0x80000000U, 0U);

				prio_allocate = true;

				break;

			}

			/* fall-through */
@@ -383,7 +384,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, 
	     back = &tp->next) {

		if (tp->prio >= prio) {

			if (tp->prio == prio) {

				if (!nprio ||

				if (prio_allocate ||

				    (tp->protocol != protocol && protocol)) {

					err = -EINVAL;

					goto errout;
@@ -409,11 +410,11 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, 
			goto errout;

		}



		if (!nprio)

			nprio = TC_H_MAJ(tcf_auto_prio(rtnl_dereference(*back)));

		if (prio_allocate)

			prio = TC_H_MAJ(tcf_auto_prio(rtnl_dereference(*back)));



		tp = tcf_proto_create(nla_data(tca[TCA_KIND]),

				      protocol, nprio, parent, q, block);

				      protocol, prio, parent, q, block);

		if (IS_ERR(tp)) {

			err = PTR_ERR(tp);

			goto errout;