Commit 5eb7de8c authored by Lion Ackermann's avatar Lion Ackermann Committed by David S. Miller
Browse files

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: default avatarLion Ackermann <nnamrec@gmail.com>
Acked-by: default avatarToke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 29220780

net/sched/sch_cake.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

net/sched/sch_choke.c

+1 −1
Original line number Diff line number Diff line
@@ -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 {