Commit edf6711c authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: sched: remove classid and q fields from tcf_proto 



Both are no longer used, so remove them.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Acked-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f36fe1c4

include/net/sch_generic.h

+0 −2
Original line number Diff line number Diff line
@@ -255,8 +255,6 @@ struct tcf_proto { 


	/* All the rest */

	u32			prio;

	u32			classid;

	struct Qdisc		*q;

	void			*data;

	const struct tcf_proto_ops	*ops;

	struct tcf_chain	*chain;

net/sched/cls_api.c

+2 −5
Original line number Diff line number Diff line
@@ -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,

					  u32 prio, u32 parent, struct Qdisc *q,

					  struct tcf_chain *chain)

					  u32 prio, struct tcf_chain *chain)

{

	struct tcf_proto *tp;

	int err;
@@ -157,8 +156,6 @@ static struct tcf_proto *tcf_proto_create(const char *kind, u32 protocol, 
	tp->classify = tp->ops->classify;

	tp->protocol = protocol;

	tp->prio = prio;

	tp->classid = parent;

	tp->q = q;

	tp->chain = chain;



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



		tp = tcf_proto_create(nla_data(tca[TCA_KIND]),

				      protocol, prio, parent, q, chain);

				      protocol, prio, chain);

		if (IS_ERR(tp)) {

			err = PTR_ERR(tp);

			goto errout;