From: Jamal Hadi Salim <jhs@mojatatu.com>
To: davem@davemloft.net
Cc: xiyou.wangcong@gmail.com, jiri@resnulli.us,
netdev@vger.kernel.org, viro@zeniv.linux.org.uk,
Jamal Hadi Salim <jhs@mojatatu.com>
Subject: [PATCH net-next v2 08/12] net: sched: cls_u32: pass tc_u_common to u32_set_parms() instead of tc_u_hnode
Date: Mon, 8 Oct 2018 06:22:40 -0400 [thread overview]
Message-ID: <20181008102244.22212-9-jhs@emojatatu.com> (raw)
In-Reply-To: <20181008102244.22212-1-jhs@emojatatu.com>
From: Al Viro <viro@zeniv.linux.org.uk>
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>
---
net/sched/cls_u32.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index 3f6fba831c57..53f34f8cde8b 100644
--- 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;
--
2.11.0
next prev parent reply other threads:[~2018-10-08 17:34 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-08 10:22 [PATCH net-next v2 00/12] net: sched: cls_u32 Various improvements Jamal Hadi Salim
2018-10-08 10:22 ` [PATCH net-next v2 01/12] net: sched: cls_u32: mark root hnode explicitly Jamal Hadi Salim
2018-10-08 10:22 ` [PATCH net-next v2 02/12] net: sched: cls_u32: disallow linking to root hnode Jamal Hadi Salim
2018-10-08 10:22 ` [PATCH net-next v2 03/12] net: sched: cls_u32: make sure that divisor is a power of 2 Jamal Hadi Salim
2018-10-08 10:22 ` [PATCH net-next v2 04/12] net: sched: cls_u32: get rid of unused argument of u32_destroy_key() Jamal Hadi Salim
2018-10-08 10:22 ` [PATCH net-next v2 05/12] net: sched: cls_u32: get rid of tc_u_knode ->tp Jamal Hadi Salim
2018-10-08 10:22 ` [PATCH net-next v2 06/12] net: sched: cls_u32: get rid of tc_u_common ->rcu Jamal Hadi Salim
2018-10-08 10:22 ` [PATCH net-next v2 07/12] net: sched: cls_u32: clean tc_u_common hashtable Jamal Hadi Salim
2018-10-08 10:22 ` Jamal Hadi Salim [this message]
2018-10-08 10:22 ` [PATCH net-next v2 09/12] net: sched: cls_u32: the tp_c argument of u32_set_parms() is always tp->data Jamal Hadi Salim
2018-10-08 10:22 ` [PATCH net-next v2 10/12] net: sched: cls_u32: get rid of tp_c Jamal Hadi Salim
2018-10-08 10:22 ` [PATCH net-next v2 11/12] net: sched: cls_u32: keep track of knodes count in tc_u_common Jamal Hadi Salim
2018-10-08 10:22 ` [PATCH net-next v2 12/12] net: sched: cls_u32: simplify the hell out u32_delete() emptiness check Jamal Hadi Salim
2018-10-08 17:33 ` [PATCH net-next v2 00/12] net: sched: cls_u32 Various improvements David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181008102244.22212-9-jhs@emojatatu.com \
--to=jhs@mojatatu.com \
--cc=davem@davemloft.net \
--cc=jiri@resnulli.us \
--cc=netdev@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=xiyou.wangcong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox