net: sched: fix ordering of qlen adjustment

Changes to sch->q.qlen around qdisc_tree_reduce_backlog() need to happen
_before_ a call to said function because otherwise it may fail to notify
parent qdiscs when the child is about to become empty.

Signed-off-by: Lion Ackermann <nnamrec@gmail.com>
Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c
index f2f9b75008bb059d17ced6c405dbc5071da392a3..8d8b2db4653c0c9f271f9c1953e8c61175d8f76b 100644 (file)
--- a/net/sched/sch_cake.c
+++ b/net/sched/sch_cake.c
@@ -1525,7 +1525,6 @@ static unsigned int cake_drop(struct Qdisc *sch, struct sk_buff **to_free)
        b->backlogs[idx]    -= len;
        b->tin_backlog      -= len;
        sch->qstats.backlog -= len;
-       qdisc_tree_reduce_backlog(sch, 1, len);
 
        flow->dropped++;
        b->tin_dropped++;
@@ -1536,6 +1535,7 @@ static unsigned int cake_drop(struct Qdisc *sch, struct sk_buff **to_free)
 
        __qdisc_drop(skb, to_free);
        sch->q.qlen--;
+       qdisc_tree_reduce_backlog(sch, 1, len);
 
        cake_heapify(q, 0);
 

diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c
index 1e940ad0d2fad122508fdc178fb7a5bcd6b80c6e..59e7bdf5063e8ce75d69b3127512985ae8cc499a 100644 (file)
--- a/net/sched/sch_choke.c
+++ b/net/sched/sch_choke.c
@@ -123,10 +123,10 @@ static void choke_drop_by_idx(struct Qdisc *sch, unsigned int idx,
        if (idx == q->tail)
                choke_zap_tail_holes(q);
 
+       --sch->q.qlen;
        qdisc_qstats_backlog_dec(sch, skb);
        qdisc_tree_reduce_backlog(sch, 1, qdisc_pkt_len(skb));
        qdisc_drop(skb, sch, to_free);
-       --sch->q.qlen;
 }
 
 struct choke_skb_cb {