From: Eric Dumazet <edumazet@google.com>
Date: Fri, 10 Jun 2016 23:41:38 +0000 (-0700)
Subject: net_sched: netem: remove qdisc_is_throttled() use
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=42117927cab5a13192ecc227bea19da5059ffc6c;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

net_sched: netem: remove qdisc_is_throttled() use

Looks like it is only there as some optimization attempt.

Since __QDISC_STATE_THROTTLED set/unset is way too expensive,
and netem is the last user, just remove this check.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index 9ca7947ab643..2dbe732ca135 100644
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -582,9 +582,6 @@ static struct sk_buff *netem_dequeue(struct Qdisc *sch)
 	struct sk_buff *skb;
 	struct rb_node *p;
 
-	if (qdisc_is_throttled(sch))
-		return NULL;
-
 tfifo_dequeue:
 	skb = __skb_dequeue(&sch->q);
 	if (skb) {