These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / net / sched / sch_ingress.c

diff --git a/kernel/net/sched/sch_ingress.c b/kernel/net/sched/sch_ingress.c
index 4cdbfb8..e7c648f 100644 (file)
--- a/kernel/net/sched/sch_ingress.c
+++ b/kernel/net/sched/sch_ingress.c
@@ -12,16 +12,10 @@
 #include <linux/list.h>
 #include <linux/skbuff.h>
 #include <linux/rtnetlink.h>
+
 #include <net/netlink.h>
 #include <net/pkt_sched.h>
 
-
-struct ingress_qdisc_data {
-       struct tcf_proto __rcu  *filter_list;
-};
-
-/* ------------------------- Class/flow operations ------------------------- */
-
 static struct Qdisc *ingress_leaf(struct Qdisc *sch, unsigned long arg)
 {
        return NULL;
@@ -49,57 +43,24 @@ static void ingress_walk(struct Qdisc *sch, struct qdisc_walker *walker)
 static struct tcf_proto __rcu **ingress_find_tcf(struct Qdisc *sch,
                                                 unsigned long cl)
 {
-       struct ingress_qdisc_data *p = qdisc_priv(sch);
-
-       return &p->filter_list;
-}
-
-/* --------------------------- Qdisc operations ---------------------------- */
+       struct net_device *dev = qdisc_dev(sch);
 
-static int ingress_enqueue(struct sk_buff *skb, struct Qdisc *sch)
-{
-       struct ingress_qdisc_data *p = qdisc_priv(sch);
-       struct tcf_result res;
-       struct tcf_proto *fl = rcu_dereference_bh(p->filter_list);
-       int result;
-
-       result = tc_classify(skb, fl, &res);
-
-       qdisc_bstats_update(sch, skb);
-       switch (result) {
-       case TC_ACT_SHOT:
-               result = TC_ACT_SHOT;
-               qdisc_qstats_drop(sch);
-               break;
-       case TC_ACT_STOLEN:
-       case TC_ACT_QUEUED:
-               result = TC_ACT_STOLEN;
-               break;
-       case TC_ACT_RECLASSIFY:
-       case TC_ACT_OK:
-               skb->tc_index = TC_H_MIN(res.classid);
-       default:
-               result = TC_ACT_OK;
-               break;
-       }
-
-       return result;
+       return &dev->ingress_cl_list;
 }
 
-/* ------------------------------------------------------------- */
-
 static int ingress_init(struct Qdisc *sch, struct nlattr *opt)
 {
        net_inc_ingress_queue();
+       sch->flags |= TCQ_F_CPUSTATS;
 
        return 0;
 }
 
 static void ingress_destroy(struct Qdisc *sch)
 {
-       struct ingress_qdisc_data *p = qdisc_priv(sch);
+       struct net_device *dev = qdisc_dev(sch);
 
-       tcf_destroy_chain(&p->filter_list);
+       tcf_destroy_chain(&dev->ingress_cl_list);
        net_dec_ingress_queue();
 }
 
@@ -110,6 +71,7 @@ static int ingress_dump(struct Qdisc *sch, struct sk_buff *skb)
        nest = nla_nest_start(skb, TCA_OPTIONS);
        if (nest == NULL)
                goto nla_put_failure;
+
        return nla_nest_end(skb, nest);
 
 nla_put_failure:
@@ -130,8 +92,6 @@ static const struct Qdisc_class_ops ingress_class_ops = {
 static struct Qdisc_ops ingress_qdisc_ops __read_mostly = {
        .cl_ops         =       &ingress_class_ops,
        .id             =       "ingress",
-       .priv_size      =       sizeof(struct ingress_qdisc_data),
-       .enqueue        =       ingress_enqueue,
        .init           =       ingress_init,
        .destroy        =       ingress_destroy,
        .dump           =       ingress_dump,
@@ -148,6 +108,7 @@ static void __exit ingress_module_exit(void)
        unregister_qdisc(&ingress_qdisc_ops);
 }
 
-module_init(ingress_module_init)
-module_exit(ingress_module_exit)
+module_init(ingress_module_init);
+module_exit(ingress_module_exit);
+
 MODULE_LICENSE("GPL");