aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2016-06-10 16:41:38 -0700
committerDavid S. Miller <davem@davemloft.net>2016-06-10 23:58:21 -0700
commit42117927cab5a13192ecc227bea19da5059ffc6c (patch)
tree62af5997a0dc6ec1927e94a55d5cdbf0d9abcc0a
parentnet_sched: cbq: remove a flaky use of qdisc_is_throttled() (diff)
downloadlinux-dev-42117927cab5a13192ecc227bea19da5059ffc6c.tar.xz
linux-dev-42117927cab5a13192ecc227bea19da5059ffc6c.zip
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>
-rw-r--r--net/sched/sch_netem.c3
1 files changed, 0 insertions, 3 deletions
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) {