[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, 18 deletions

diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c
index 37ae6d1deb14..417ec8fb7f1a 100644
--- a/net/sched/sch_atm.c
+++ b/net/sched/sch_atm.c
@@ -428,26 +428,9 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch)
                                 ATM_SKB(skb)->atm_options |= ATM_ATMOPT_CLP;
                         break;
                 }
-#elif defined(CONFIG_NET_CLS_POLICE)
-                switch (result) {
-                case TC_POLICE_SHOT:
-                        kfree_skb(skb);
-                        goto drop;
-                case TC_POLICE_RECLASSIFY:
-                        if (flow->excess)
-                                flow = flow->excess;
-                        else {
-                                ATM_SKB(skb)->atm_options |= ATM_ATMOPT_CLP;
-                                break;
-                        }
-                        /* fall through */
-                case TC_POLICE_OK:
-                        /* fall through */
-                default:
-                        break;
-                }
 #endif
         }
+
         if ((ret = flow->q->enqueue(skb, flow->q)) != 0) {
 drop: __maybe_unused
                 sch->qstats.drops++;