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

Commit 7961973a authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: sched: move TC_H_MAJ macro call into tcf_auto_prio 



Call the helper from the function rather than to always adjust the
return value of the function.

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 9d36d9e5

net/sched/cls_api.c

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static inline u32 tcf_auto_prio(struct tcf_proto *tp) 
	if (tp)

		first = tp->prio - 1;



	return first;

	return TC_H_MAJ(first);

}



static struct tcf_proto *tcf_proto_create(const char *kind, u32 protocol,
@@ -411,7 +411,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, 
		}



		if (prio_allocate)

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

			prio = tcf_auto_prio(rtnl_dereference(*back));



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

				      protocol, prio, parent, q, block);