summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2016-06-11 12:46:04 +0200
committerDavid S. Miller <davem@davemloft.net>2016-06-13 04:02:11 +0200
commit99860208bc62d8ebd5c57495b84856506fe075bc (patch)
tree7022babf83bb0049dc11618bd1f76f55115f3c16 /net/core
parentnet: fec: handle small PHY reset durations more precisely (diff)
downloadlinux-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/core')
-rw-r--r--net/core/pktgen.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 8b02df0d354d..f74ab9c3b38f 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3463,7 +3463,6 @@ xmit_more:
break;
case NET_XMIT_DROP:
case NET_XMIT_CN:
- case NET_XMIT_POLICED:
/* skb has been consumed */
pkt_dev->errors++;
break;