net: sched: cls_u32: pass tc_u_common to u32_set_parms() instead of tc_u_hnode

the only thing we used ht for was ht->tp_c and callers can get that
without going through ->tp_c at all; start with lifting that into
the callers, next commits will massage those, eventually removing
->tp_c altogether.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index 3f6fba831c57f59cab006f93d49bbfa06c5d04ae..53f34f8cde8b5fd15f2aa7bc8afca0d1d9e7c629 100644 (file)
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -761,7 +761,7 @@ static const struct nla_policy u32_policy[TCA_U32_MAX + 1] = {
 };
 
 static int u32_set_parms(struct net *net, struct tcf_proto *tp,
-                        unsigned long base, struct tc_u_hnode *ht,
+                        unsigned long base, struct tc_u_common *tp_c,
                         struct tc_u_knode *n, struct nlattr **tb,
                         struct nlattr *est, bool ovr,
                         struct netlink_ext_ack *extack)
@@ -782,7 +782,7 @@ static int u32_set_parms(struct net *net, struct tcf_proto *tp,
                }
 
                if (handle) {
-                       ht_down = u32_lookup_ht(ht->tp_c, handle);
+                       ht_down = u32_lookup_ht(tp_c, handle);
 
                        if (!ht_down) {
                                NL_SET_ERR_MSG_MOD(extack, "Link hash table not found");
@@ -957,7 +957,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
                        return -ENOMEM;
 
                err = u32_set_parms(net, tp, base,
-                                   rtnl_dereference(n->ht_up), new, tb,
+                                   rtnl_dereference(n->ht_up)->tp_c, new, tb,
                                    tca[TCA_RATE], ovr, extack);
 
                if (err) {
@@ -1124,7 +1124,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
        }
 #endif
 
-       err = u32_set_parms(net, tp, base, ht, n, tb, tca[TCA_RATE], ovr,
+       err = u32_set_parms(net, tp, base, ht->tp_c, n, tb, tca[TCA_RATE], ovr,
                            extack);
        if (err == 0) {
                struct tc_u_knode __rcu **ins;