iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Al Viro 2018-10-08 06:22:40 -04:00 committed by David S. Miller
parent 4895c42f62
commit 18512f5c25
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/sched/cls_u32.c
View File

@ -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, 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 tc_u_knode *n, struct nlattr **tb,
struct nlattr *est, bool ovr, struct nlattr *est, bool ovr,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
@ -782,7 +782,7 @@ static int u32_set_parms(struct net *net, struct tcf_proto *tp,
} }
if (handle) { if (handle) {
ht_down = u32_lookup_ht(ht->tp_c, handle); ht_down = u32_lookup_ht(tp_c, handle);
if (!ht_down) { if (!ht_down) {
NL_SET_ERR_MSG_MOD(extack, "Link hash table not found"); 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; return -ENOMEM;
err = u32_set_parms(net, tp, base, 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); tca[TCA_RATE], ovr, extack);
if (err) { if (err) {
@ -1124,7 +1124,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
} }
#endif #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); extack);
if (err == 0) { if (err == 0) {
struct tc_u_knode __rcu **ins; struct tc_u_knode __rcu **ins;