diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2016-06-13 10:47:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-15 00:05:57 -0700 |
| commit | 95df1b16074ce1e5dc4129fa206afbac32663e06 (patch) | |
| tree | fc9429d1238bbdf5438e195e050c83f5e4fb49b7 /net/sched | |
| parent | 161cd45ff0670c3068adb3de33e26495b648e906 (diff) | |
| download | linux-rpi-95df1b16074ce1e5dc4129fa206afbac32663e06.tar.gz linux-rpi-95df1b16074ce1e5dc4129fa206afbac32663e06.tar.bz2 linux-rpi-95df1b16074ce1e5dc4129fa206afbac32663e06.zip | |
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')
| -rw-r--r-- | net/sched/act_ipt.c | 2 | ||||
| -rw-r--r-- | net/sched/sch_atm.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c index e7c0f4d944a2..8998a3594e86 100644 --- 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 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) 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 |