From: Jamal Hadi Salim <jhs@mojatatu.com>
To: davem@davemloft.net
Cc: jiri@resnulli.us, xiyou.wangcong@gmail.com,
viro@zeniv.linux.org.uk, netdev@vger.kernel.org,
Jamal Hadi Salim <jhs@mojatatu.com>
Subject: [PATCH net-next 09/11] net: sched: cls_u32: get rid of tp_c
Date: Sun, 7 Oct 2018 12:38:09 -0400 [thread overview]
Message-ID: <20181007163811.18453-10-jhs@emojatatu.com> (raw)
In-Reply-To: <20181007163811.18453-1-jhs@emojatatu.com>
From: Al Viro <viro@zeniv.linux.org.uk>
Both hnode ->tp_c and tp_c argument of u32_set_parms()
the latter is redundant, the former - never read...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
---
net/sched/cls_u32.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index 3ed2c9866b36..3d4c360f9b0c 100644
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -79,7 +79,6 @@ struct tc_u_hnode {
struct tc_u_hnode __rcu *next;
u32 handle;
u32 prio;
- struct tc_u_common *tp_c;
int refcnt;
unsigned int divisor;
struct idr handle_idr;
@@ -390,7 +389,6 @@ static int u32_init(struct tcf_proto *tp)
tp_c->refcnt++;
RCU_INIT_POINTER(root_ht->next, tp_c->hlist);
rcu_assign_pointer(tp_c->hlist, root_ht);
- root_ht->tp_c = tp_c;
rcu_assign_pointer(tp->root, root_ht);
tp->data = tp_c;
@@ -761,7 +759,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_common *tp_c,
+ unsigned long base,
struct tc_u_knode *n, struct nlattr **tb,
struct nlattr *est, bool ovr,
struct netlink_ext_ack *extack)
@@ -782,7 +780,7 @@ static int u32_set_parms(struct net *net, struct tcf_proto *tp,
}
if (handle) {
- ht_down = u32_lookup_ht(tp_c, handle);
+ ht_down = u32_lookup_ht(tp->data, handle);
if (!ht_down) {
NL_SET_ERR_MSG_MOD(extack, "Link hash table not found");
@@ -956,7 +954,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
if (!new)
return -ENOMEM;
- err = u32_set_parms(net, tp, base, tp_c, new, tb,
+ err = u32_set_parms(net, tp, base, new, tb,
tca[TCA_RATE], ovr, extack);
if (err) {
@@ -1012,7 +1010,6 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
return err;
}
}
- ht->tp_c = tp_c;
ht->refcnt = 1;
ht->divisor = divisor;
ht->handle = handle;
@@ -1123,7 +1120,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
}
#endif
- err = u32_set_parms(net, tp, base, tp_c, n, tb, tca[TCA_RATE], ovr,
+ err = u32_set_parms(net, tp, base, 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-07 23:46 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-07 16:38 [PATCH net-next 00/11] net: sched: cls_u32 Various improvements Jamal Hadi Salim
2018-10-07 16:38 ` [PATCH net-next 01/11] net: sched: cls_u32: disallow linking to root hnode Jamal Hadi Salim
2018-10-07 16:38 ` [PATCH net-next 02/11] net: sched: cls_u32: make sure that divisor is a power of 2 Jamal Hadi Salim
2018-10-08 8:46 ` Sergei Shtylyov
2018-10-08 9:49 ` Jamal Hadi Salim
2018-10-07 16:38 ` [PATCH net-next 03/11] net: sched: cls_u32: get rid of unused argument of u32_destroy_key() Jamal Hadi Salim
2018-10-07 16:38 ` [PATCH net-next 04/11] net: sched: cls_u32: get rid of tc_u_knode ->tp Jamal Hadi Salim
2018-10-07 16:38 ` [PATCH net-next 05/11] net: sched: cls_u32: get rid of tc_u_common ->rcu Jamal Hadi Salim
2018-10-07 16:38 ` [PATCH net-next 06/11] net: sched: cls_u32: clean tc_u_common hashtable Jamal Hadi Salim
2018-10-07 16:38 ` [PATCH net-next 07/11] net: sched: cls_u32: pass tc_u_common to u32_set_parms() instead of tc_u_hnode Jamal Hadi Salim
2018-10-07 16:38 ` [PATCH net-next 08/11] net: sched: cls_u32: the tp_c argument of u32_set_parms() is always tp->data Jamal Hadi Salim
2018-10-07 16:38 ` Jamal Hadi Salim [this message]
2018-10-07 16:38 ` [PATCH net-next 10/11] net: sched: cls_u32: keep track of knodes count in tc_u_common Jamal Hadi Salim
2018-10-07 16:38 ` [PATCH net-next 11/11] net: sched: cls_u32: simplify the hell out u32_delete() emptiness check Jamal Hadi Salim
2018-10-08 4:25 ` [PATCH net-next 00/11] net: sched: cls_u32 Various improvements David Miller
2018-10-08 5:45 ` Al Viro
2018-10-08 5:55 ` David Miller
2018-10-08 6:11 ` Al Viro
2018-10-08 9:47 ` Jamal Hadi Salim
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=20181007163811.18453-10-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;
as well as URLs for NNTP newsgroup(s).