diff options
| author | Florian Westphal <fw@strlen.de> | 2016-06-11 12:46:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-12 22:02:11 -0400 |
| commit | 99860208bc62d8ebd5c57495b84856506fe075bc (patch) | |
| tree | 7022babf83bb0049dc11618bd1f76f55115f3c16 /net/batman-adv/routing.c | |
| parent | eb37c56361df4a3e9705e808ce3f3bb483da3814 (diff) | |
| download | linux-99860208bc62d8ebd5c57495b84856506fe075bc.tar.gz linux-99860208bc62d8ebd5c57495b84856506fe075bc.tar.bz2 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/batman-adv/routing.c')
| -rw-r--r-- | net/batman-adv/routing.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index e3857ed4057f..f75091c983ee 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -653,7 +653,7 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, len + ETH_HLEN); ret = NET_RX_SUCCESS; - } else if (res == NET_XMIT_POLICED) { + } else if (res == -EINPROGRESS) { /* skb was buffered and consumed */ ret = NET_RX_SUCCESS; } |