GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-21 05:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: sched: remove classid and q fields from tcf_proto

Browse source 
Both are no longer used, so remove them.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Acked-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2018-01-17 11:46:49 +01:00 • committed by David S. Miller
parent f36fe1c498
commit edf6711c98
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/net/sch_generic.h
View file

@ -255,8 +255,6 @@ struct tcf_proto {
/* All the rest */ /* All the rest */
u32 prio; u32 prio;
u32 classid;
struct Qdisc *q;
void *data; void *data;
const struct tcf_proto_ops *ops; const struct tcf_proto_ops *ops;
struct tcf_chain *chain; struct tcf_chain *chain;

7
net/sched/cls_api.c
View file

@ -122,8 +122,7 @@ static inline u32 tcf_auto_prio(struct tcf_proto *tp)
} }
static struct tcf_proto *tcf_proto_create(const char *kind, u32 protocol, static struct tcf_proto *tcf_proto_create(const char *kind, u32 protocol,
u32 prio, u32 parent, struct Qdisc *q, u32 prio, struct tcf_chain *chain)
struct tcf_chain *chain)
{ {
struct tcf_proto *tp; struct tcf_proto *tp;
int err; int err;
@ -157,8 +156,6 @@ static struct tcf_proto *tcf_proto_create(const char *kind, u32 protocol,
tp->classify = tp->ops->classify; tp->classify = tp->ops->classify;
tp->protocol = protocol; tp->protocol = protocol;
tp->prio = prio; tp->prio = prio;
tp->classid = parent;
tp->q = q;
tp->chain = chain; tp->chain = chain;
err = tp->ops->init(tp); err = tp->ops->init(tp);
@ -1069,7 +1066,7 @@ replay:
prio = tcf_auto_prio(tcf_chain_tp_prev(&chain_info)); prio = tcf_auto_prio(tcf_chain_tp_prev(&chain_info));
tp = tcf_proto_create(nla_data(tca[TCA_KIND]), tp = tcf_proto_create(nla_data(tca[TCA_KIND]),
protocol, prio, parent, q, chain); protocol, prio, chain);
if (IS_ERR(tp)) { if (IS_ERR(tp)) {
err = PTR_ERR(tp); err = PTR_ERR(tp);
goto errout; goto errout;