diff options
| author | Florian Westphal <fw@strlen.de> | 2016-06-11 12:46:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-13 04:02:11 +0200 |
| commit | 99860208bc62d8ebd5c57495b84856506fe075bc (patch) | |
| tree | 7022babf83bb0049dc11618bd1f76f55115f3c16 /net/sched/sch_atm.c | |
| parent | net: fec: handle small PHY reset durations more precisely (diff) | |
| download | linux-99860208bc62d8ebd5c57495b84856506fe075bc.tar.xz linux-99860208bc62d8ebd5c57495b84856506fe075bc.zip | |
sched: remove NET_XMIT_POLICED
sch_atm returns this when TC_ACT_SHOT classification occurs.
But all other schedulers that use tc_classify
(htb, hfsc, drr, fq_codel ...) return NET_XMIT_SUCCESS | __BYPASS
in this case so just do that in atm.
BATMAN uses it as an intermediate return value to signal
forwarding vs. buffering, but it did not return POLICED to
callers outside of BATMAN.
Reviewed-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Florian Westphal <fw@strlen.de>
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c index 7e6c12dfc66a..0785b239ddf9 100644 --- a/net/sched/sch_atm.c +++ b/net/sched/sch_atm.c @@ -363,7 +363,7 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch) struct atm_flow_data *flow; struct tcf_result res; int result; - int ret = NET_XMIT_POLICED; + 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 */ |