Browse Source

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>
WANG Cong 9 years ago
parent
commit
95df1b1607
2 changed files with 3 additions and 3 deletions
  1. 1 1
      net/sched/act_ipt.c
  2. 2 2
      net/sched/sch_atm.c

+ 1 - 1
net/sched/act_ipt.c

@@ -243,7 +243,7 @@ static int tcf_ipt(struct sk_buff *skb, const struct tc_action *a,
 	default:
 	default:
 		net_notice_ratelimited("tc filter: Bogus netfilter code %d assume ACCEPT\n",
 		net_notice_ratelimited("tc filter: Bogus netfilter code %d assume ACCEPT\n",
 				       ret);
 				       ret);
-		result = TC_POLICE_OK;
+		result = TC_ACT_OK;
 		break;
 		break;
 	}
 	}
 	spin_unlock(&ipt->tcf_lock);
 	spin_unlock(&ipt->tcf_lock);

+ 2 - 2
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;
 	int ret = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
 
 
 	pr_debug("atm_tc_enqueue(skb %p,sch %p,[qdisc %p])\n", skb, sch, p);
 	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;
 	flow = NULL;
 	if (TC_H_MAJ(skb->priority) != sch->handle ||
 	if (TC_H_MAJ(skb->priority) != sch->handle ||
 	    !(flow = (struct atm_flow_data *)atm_tc_get(sch, skb->priority))) {
 	    !(flow = (struct atm_flow_data *)atm_tc_get(sch, skb->priority))) {
@@ -403,7 +403,7 @@ done:
 		case TC_ACT_SHOT:
 		case TC_ACT_SHOT:
 			kfree_skb(skb);
 			kfree_skb(skb);
 			goto drop;
 			goto drop;
-		case TC_POLICE_RECLASSIFY:
+		case TC_ACT_RECLASSIFY:
 			if (flow->excess)
 			if (flow->excess)
 				flow = flow->excess;
 				flow = flow->excess;
 			else
 			else