net_sched: remove internal use of TC_POLICE_*

These should be gone when we removed CONFIG_NET_CLS_POLICE.
We can not totally remove them since they are exposed
to userspace.

Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index e7c0f4d944a2d01ececc40956fbcf14f9c069767..8998a3594e86c9ec448d3c6d0dcea14f915b8810 100644 (file)
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -243,7 +243,7 @@ static int tcf_ipt(struct sk_buff *skb, const struct tc_action *a,
        default:
                net_notice_ratelimited("tc filter: Bogus netfilter code %d assume ACCEPT\n",
                                       ret);
-               result = TC_POLICE_OK;
+               result = TC_ACT_OK;
                break;
        }
        spin_unlock(&ipt->tcf_lock);

diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c
index 0785b239ddf96fb681623539de003865d352cbaf..e04ea6994d1ceca5700d137aaa7df87c659785f0 100644 (file)
--- a/net/sched/sch_atm.c
+++ b/net/sched/sch_atm.c
@@ -366,7 +366,7 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch)
        int ret = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
 
        pr_debug("atm_tc_enqueue(skb %p,sch %p,[qdisc %p])\n", skb, sch, p);
-       result = TC_POLICE_OK;  /* be nice to gcc */
+       result = TC_ACT_OK;     /* be nice to gcc */
        flow = NULL;
        if (TC_H_MAJ(skb->priority) != sch->handle ||
            !(flow = (struct atm_flow_data *)atm_tc_get(sch, skb->priority))) {
@@ -403,7 +403,7 @@ done:
                case TC_ACT_SHOT:
                        kfree_skb(skb);
                        goto drop;
-               case TC_POLICE_RECLASSIFY:
+               case TC_ACT_RECLASSIFY:
                        if (flow->excess)
                                flow = flow->excess;
                        else