Skip to content

Commit edf6711

Browse files
jpirkodavem330
authored andcommitted
net: sched: remove classid and q fields from tcf_proto
Both are no longer used, so remove them. Signed-off-by: Jiri Pirko <[email protected]> Acked-by: Jamal Hadi Salim <[email protected]> Acked-by: David Ahern <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent f36fe1c commit edf6711

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

include/net/sch_generic.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,6 @@ struct tcf_proto {
255255

256256
/* All the rest */
257257
u32 prio;
258-
u32 classid;
259-
struct Qdisc *q;
260258
void *data;
261259
const struct tcf_proto_ops *ops;
262260
struct tcf_chain *chain;

net/sched/cls_api.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@ static inline u32 tcf_auto_prio(struct tcf_proto *tp)
122122
}
123123

124124
static struct tcf_proto *tcf_proto_create(const char *kind, u32 protocol,
125-
u32 prio, u32 parent, struct Qdisc *q,
126-
struct tcf_chain *chain)
125+
u32 prio, struct tcf_chain *chain)
127126
{
128127
struct tcf_proto *tp;
129128
int err;
@@ -157,8 +156,6 @@ static struct tcf_proto *tcf_proto_create(const char *kind, u32 protocol,
157156
tp->classify = tp->ops->classify;
158157
tp->protocol = protocol;
159158
tp->prio = prio;
160-
tp->classid = parent;
161-
tp->q = q;
162159
tp->chain = chain;
163160

164161
err = tp->ops->init(tp);
@@ -1069,7 +1066,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n,
10691066
prio = tcf_auto_prio(tcf_chain_tp_prev(&chain_info));
10701067

10711068
tp = tcf_proto_create(nla_data(tca[TCA_KIND]),
1072-
protocol, prio, parent, q, chain);
1069+
protocol, prio, chain);
10731070
if (IS_ERR(tp)) {
10741071
err = PTR_ERR(tp);
10751072
goto errout;

0 commit comments

Comments
 (0)