[patch net-next v3 05/10] net: sched: move TC_H_MAJ macro call into tcf_auto_prio

[Jiri Pirko]

From: Jiri Pirko <j...@mellanox.com>

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

Signed-off-by: Jiri Pirko <j...@mellanox.com>
---
 net/sched/cls_api.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 0e49e6e..72624fa 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -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,
@@ -405,7 +405,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);
-- 
2.9.3