[NET_SCHED]: Kill CONFIG_NET_CLS_POLICE

The NET_CLS_ACT option is now a full replacement for NET_CLS_POLICE,
remove the old code. The config option will be kept around to select
the equivalent NET_CLS_ACT options for a short time to allow easier
upgrades.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 12 deletions

diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c
index 2d7e891e6b0d..60f89199e3da 100644
--- 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;