diff options
author | WANG Cong <xiyou.wangcong@gmail.com> | 2016-06-13 13:47:43 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-06-15 03:05:57 -0400 |
commit | 95df1b16074ce1e5dc4129fa206afbac32663e06 (patch) | |
tree | fc9429d1238bbdf5438e195e050c83f5e4fb49b7 /net/sched/sch_atm.c | |
parent | 161cd45ff0670c3068adb3de33e26495b648e906 (diff) |
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>
Diffstat (limited to 'net/sched/sch_atm.c')
-rw-r--r-- | net/sched/sch_atm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c index 0785b239ddf9..e04ea6994d1c 100644 --- 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) | |||
366 | int ret = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS; | 366 | int ret = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS; |
367 | 367 | ||
368 | pr_debug("atm_tc_enqueue(skb %p,sch %p,[qdisc %p])\n", skb, sch, p); | 368 | pr_debug("atm_tc_enqueue(skb %p,sch %p,[qdisc %p])\n", skb, sch, p); |
369 | result = TC_POLICE_OK; /* be nice to gcc */ | 369 | result = TC_ACT_OK; /* be nice to gcc */ |
370 | flow = NULL; | 370 | flow = NULL; |
371 | if (TC_H_MAJ(skb->priority) != sch->handle || | 371 | if (TC_H_MAJ(skb->priority) != sch->handle || |
372 | !(flow = (struct atm_flow_data *)atm_tc_get(sch, skb->priority))) { | 372 | !(flow = (struct atm_flow_data *)atm_tc_get(sch, skb->priority))) { |
@@ -403,7 +403,7 @@ done: | |||
403 | case TC_ACT_SHOT: | 403 | case TC_ACT_SHOT: |
404 | kfree_skb(skb); | 404 | kfree_skb(skb); |
405 | goto drop; | 405 | goto drop; |
406 | case TC_POLICE_RECLASSIFY: | 406 | case TC_ACT_RECLASSIFY: |
407 | if (flow->excess) | 407 | if (flow->excess) |
408 | flow = flow->excess; | 408 | flow = flow->excess; |
409 | else | 409 | else |