net: sched: remove classid and q fields from tcf_proto

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>

diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index f655e66ce7426960ff14c9337d9188e93277793e..54b9a1ca26bd83a99d94850d46010ca6cdc27a08 100644 (file)
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -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;

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 1ca84230f4de7278b8f704d1a77eb983a80ea4ba..e36d90c20f044a8a6c88507b3613e071abde4374 100644 (file)
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -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 @@ replay:
                        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;