net_sched: netem: remove qdisc_is_throttled() use
authorEric Dumazet <edumazet@google.com>
Fri, 10 Jun 2016 23:41:38 +0000 (16:41 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 11 Jun 2016 06:58:21 +0000 (23:58 -0700)
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>
net/sched/sch_netem.c

index 9ca7947ab6437c2b7c24b347dfa05129ee99c63b..2dbe732ca135d07567326e4c3b018f0266ee91c9 100644 (file)
@@ -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) {