[NET_SCHED]: kill obsolete NET_CLS_POLICE option

[linux-2.6] / net / sched / sch_dsmark.c

diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c
index 2d7e891e6b0de52d1bf5e7a8de2e95c77b45d283..b9fe6975fbec6585d36c0a015310267d12198085 100644 (file)
--- a/net/sched/sch_dsmark.c
+++ b/net/sched/sch_dsmark.c
@@ -246,21 +246,10 @@ static int dsmark_enqueue(struct sk_buff *skb,struct Qdisc *sch)
                        kfree_skb(skb);
                        sch->qstats.drops++;
                        return NET_XMIT_BYPASS;
-#elif defined(CONFIG_NET_CLS_POLICE)
-               case TC_POLICE_SHOT:
-                       kfree_skb(skb);
-                       sch->qstats.drops++;
-                       return NET_XMIT_POLICED;
-#if 0
-               case TC_POLICE_RECLASSIFY:
-                       /* FIXME: what to do here ??? */
-#endif
 #endif
-               case TC_POLICE_OK:
+               case TC_ACT_OK:
                        skb->tc_index = TC_H_MIN(res.classid);
                        break;
-               case TC_POLICE_UNSPEC:
-                       /* fall through */
                default:
                        if (p->default_index != NO_DEFAULT_INDEX)
                                skb->tc_index = p->default_index;
@@ -472,7 +461,7 @@ rtattr_failure:
        return RTA_NEST_CANCEL(skb, opts);
 }
 
-static struct Qdisc_class_ops dsmark_class_ops = {
+static const struct Qdisc_class_ops dsmark_class_ops = {
        .graft          =       dsmark_graft,
        .leaf           =       dsmark_leaf,
        .get            =       dsmark_get,
@@ -486,7 +475,7 @@ static struct Qdisc_class_ops dsmark_class_ops = {
        .dump           =       dsmark_dump_class,
 };
 
-static struct Qdisc_ops dsmark_qdisc_ops = {
+static struct Qdisc_ops dsmark_qdisc_ops __read_mostly = {
        .next           =       NULL,
        .cl_ops         =       &dsmark_class_ops,
        .id             =       "dsmark",